Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Jan 2017 17:21:42 +0000 (18:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Jan 2017 17:21:42 +0000 (18:21 +0100)
commit2b86808385641bc06f1014e010e7b74a6f691087
tree32c58b291f3908f897eb13299b3c8c9927ce4513
parent2b42bb829c56095ca6b77863a0c5af0eb04063bc
parenta70320383cc9b3a5aa6e0c25820b52dee645c782
Merge branch '2015.11' into 2015.11-develop

Change-Id: I7519e497011921a0de670af3c86952a9db25981b
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/composer.json
tine20/composer.lock