Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:29 +0000 (18:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:29 +0000 (18:26 +0200)
commitf4f87a2706c4ae68f36be931f6bdaeecbe73acfc
tree587918f5a4eab0085206e7af42f3d0c532cd503c
parente1df88d43eec852ea9fcf95267c75f8632f22abf
parent1783cf7a8235c2db94bb4856ed5e7201325751dc
Merge branch '2015.11-develop' into 2016.03
tests/tine20/Timetracker/JsonTest.php
tine20/build.xml