Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Jul 2016 13:14:12 +0000 (15:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Jul 2016 13:14:12 +0000 (15:14 +0200)
Change-Id: Iead0d8f8da04549dadf1864ad4ae380901a6ec0b

1  2 
tests/tine20/Sales/InvoiceControllerTests.php
tine20/Calendar/Controller.php
tine20/build.xml
tine20/composer.lock

Simple merge
Simple merge
Simple merge