Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:20 +0000 (15:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:20 +0000 (15:06 +0100)
commitd899746f2690e61e8eace75e42223384e188795a
tree86a7243a2a6a391350c101e394bd101e77d83046
parent5f76731f4a140b3540313e51548c7467a5c89cd0
parent4bc32ba09c4f83ea533bdfc1d99a2b348cb3992a
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Crm/JsonTest.php
tests/tine20/TestCase.php
tests/tine20/Tinebase/Frontend/Json/PersistentFilterTest.php