Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:20 +0000 (18:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:20 +0000 (18:06 +0100)
commit2d5e26a8bd6b672dbc4e6f073732153ae5dee6f7
treefbe88503afa89b4349c4a565c1cb3983fc241597
parent77c1033e377ccfb51ba684dbcdab0f75b53f5872
parent39afc864d846e78c1a80d22fbc9a6cd972ce398c
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Felamimail/Model/Message.php