Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:08 +0000 (15:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:08 +0000 (15:54 +0100)
commit12e470b358c7a7f800a35389d003bbdcaaad5ab9
tree0cbad64fb48196b67f3a2c380f35661306f10ac9
parent8911115b5ca617655192ec34b59be7952032eefb
parentc2ef2873d1c936b24a4d1ab419a3cd72ad78ed7f
Merge branch '2015.11-develop' into 2016.11

Change-Id: Ic4c1c847242fa32a90271bd7115f9d3b50267199
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Import/Abstract.php