Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:44:53 +0000 (12:44 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:44:53 +0000 (12:44 +0100)
commit7ede471f21fde76ac0d6ecc5e0ea6484d73fabf0
treea0bebb4421fe36f6d645ba70fd623abce6bee070
parent06d4c33fce68701ce9a32544fa8cd7579c0b1d22
parent6712316a5bf4b27939cc93d2378764ae46963c86
Merge branch '2015.11' into 2015.11-develop
tine20/Setup/Controller.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js