Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 11:50:38 +0000 (12:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 11:50:38 +0000 (12:50 +0100)
commit486a94738a43ceb2ebddb4e72d6c12dc3a3a7663
treede8f9f2e8a88ded82dc2cee034966fe9232cb33d
parenta5f3bbcac6602f891904c97120ba8fd2768e2f8b
parentff6417a3f14052cb7d8e22db17441d13cddb9f87
Merge branch '2015.11' into 2015.11-develop

Change-Id: I79818d27d71703be374de72a2ffd59b3f62e4640
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Tinebase/ScheduledImportTest.php
tine20/Calendar/Frontend/Json.php
tine20/Tinebase/Controller/ScheduledImport.php
tine20/Tinebase/Model/Import.php