Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Jan 2016 10:09:00 +0000 (11:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Jan 2016 10:09:00 +0000 (11:09 +0100)
1  2 
tine20/Tinebase/js/widgets/dialog/DuplicateResolveGridPanel.js