Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:39 +0000 (10:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:39 +0000 (10:14 +0200)
commitbef3153b5ae52499096fda5558bc435d05581ee5
tree7d68c60e4d679943f9887c5d1dead11304f4a556
parenta3e2c03291e38759530961f8f09a070312905ff0
parentbaa1c7894916cf87d878a5837bb40aafa7d21441
Merge branch '2015.11-develop' into 2016.11
tine20/Tinebase/Config.php
tine20/composer.lock