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)
commit46ef9c2e4ccbbefc08e3c7d0738dfd491428edd5
tree63f2963db94470c2b1cd0132e0b3509cad5e8722
parent7a8610198d41d7757d7af7f55169f74998399d9a
parent8f686188fcc0f2a448d7695878b054d665b93358
Merge branch '2014.11' into 2014.11-develop
tine20/Tinebase/js/widgets/dialog/DuplicateResolveGridPanel.js