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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge