Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:26:07 +0000 (15:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:26:07 +0000 (15:26 +0200)
commit04932f63e078ae336a686af0db3f812ed1b73a90
treec88deb232a4f56efdd2215c535caba80399aceb4
parentdbaeddcafd0f58272f2499daa43f4ee3a556d873
parentbd01f4a39b9e9b0a50a07fd2dec42819a93a8880
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Sales/InvoiceControllerTests.php
tests/tine20/TestCase.php
tests/tine20/Timetracker/JsonTest.php
tine20/Tinebase/Setup/DemoData/Abstract.php