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)
1  2 
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

Simple merge
Simple merge