Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:33 +0000 (18:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Mar 2017 17:06:33 +0000 (18:06 +0100)
commit410d80a50dbb4976290ac1f82abf84722644f3f1
treec9762c9cfd31590bbe2ede7e898b0ea03f5d18eb
parentf3e7c290a18bf791741b6a9240dee73335f2ba13
parent2d5e26a8bd6b672dbc4e6f073732153ae5dee6f7
Merge branch '2016.11' into 2016.11-develop
tests/tine20/Calendar/JsonTests.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Felamimail/Message.php
tine20/Tinebase/DateTime.php