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)
1  2 
tine20/Tinebase/Config.php
tine20/composer.lock

Simple merge
Simple merge