Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Nov 2015 12:35:20 +0000 (13:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Nov 2015 12:35:20 +0000 (13:35 +0100)
commit1a3a8ca40d5391cd0db997cf5bdb4831eebd6546
tree90dc17370f059eca3f39709362ff3b8170be6775
parent60d53442a4a282ebdcaca20c9e697304a42fb6c9
parent7e5d612226a62c08ba632cdad7802521a2a4e6bf
Merge branch '2014.11-develop' into 2015.11
tests/tine20/Tinebase/ConfigTest.php
tine20/ActiveSync/Config.php
tine20/Tinebase/Config/Abstract.php