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)
commitf24b1abdf3e973f328cc159f58cbe49c552e589f
tree621127121de0a5680ed5902fb251f76c58fb27f3
parented055f06e42cf92fe7d86bf73a4568381a7b439a
parente823c20ebef3843708657620f4dc9a121908d492
Merge branch '2015.11' into 2015.11-develop

Change-Id: Iead0d8f8da04549dadf1864ad4ae380901a6ec0b
tests/tine20/Sales/InvoiceControllerTests.php
tine20/Calendar/Controller.php
tine20/build.xml
tine20/composer.lock