Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 10:43:28 +0000 (12:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 10:43:28 +0000 (12:43 +0200)
commit270565881af4f0bed1be1c266762ce4280484deb
treecd8404c7cf2c75b291b49361208665065fc3f385
parent76c02dcc676f2b5d96fe5740cff1e79ad592b6d1
parentcd378edfbab5c48d7c56e218644e166f8985044f
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/translations/de.po
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/composer.json