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)
1  2 
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Crm/JsonTest.php
tests/tine20/TestCase.php
tests/tine20/Tinebase/Frontend/Json/PersistentFilterTest.php

Simple merge
Simple merge