Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jul 2016 10:00:32 +0000 (12:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jul 2016 10:00:32 +0000 (12:00 +0200)
commit5af6eba4a553eda58793c34ef5d56d5ba46ea3a3
treee119fbe02e145819721b0ce374d1d84cf1dc791e
parent6bda658d682fa2453c298d0262b9d7c64a29f5f3
parent2a6096391323e847735e38dea6e0407cf27c249e
Merge branch '2015.11-develop' into 2016.03

Change-Id: Ib5676be165a1b1d0f574fe75c5d0ce64adb3dbb0
tests/tine20/Timetracker/JsonTest.php
tine20/Calendar/Preference.php
tine20/composer.json
tine20/composer.lock