Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:51:17 +0000 (15:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:51:17 +0000 (15:51 +0100)
commitc2ef2873d1c936b24a4d1ab419a3cd72ad78ed7f
tree1441ec7bf2e87f099ac22266aa65bac75bff56ca
parent861aeec2d62979d6e328f014c7766a8574a94d8f
parente739a802011789a7545b9b1683613d2cbd985955
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Crm/JsonTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/Relations.php
tine20/Tinebase/User/Abstract.php
tine20/Tinebase/js/ExceptionHandler.js