Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 20 Oct 2016 11:34:42 +0000 (13:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 20 Oct 2016 11:34:42 +0000 (13:34 +0200)
commitccf78d51021b4e3454a90ca48983fe58a2a120d5
tree54a21d4a537ecf1a6c97fa2768ea6b170678980b
parent1e0d4b81ed97e10baeb7dd75101eca818f234ecc
parent4801308bf1d6e6a58ea8a42feea51312659712d8
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Tinebase/ApplicationTest.php
tine20/Tinebase/Setup/DemoData/Abstract.php