Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:40:13 +0000 (13:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:40:13 +0000 (13:40 +0100)
commit1aea41508dc099569d88a27a95a7652a6ae09226
tree618a2296b3b0ed73319ccb72e17350ff688981e0
parentc7fa7b3902c70ee365c7bc36f3edae717dad04af
parentf4831f54a5e4eb255e48cc717503654fde166f93
Merge branch '2014.11-develop' into 2015.11
tine20/Admin/js/container/EditDialog.js
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js