Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:09 +0000 (18:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:09 +0000 (18:06 +0100)
commit39afc864d846e78c1a80d22fbc9a6cd972ce398c
treeb88b2d70792ffb45e53479350739b6a9dc7b788e
parentd5235c11e725090310e94e5e1ac428a30d2b48ba
parente64f91c98f149dc6a1c2d5b283057b5b1e107854
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Felamimail/Model/Message.php