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)
1  2 
tests/tine20/Timetracker/JsonTest.php
tine20/build.xml

Simple merge
Simple merge