Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:36:44 +0000 (13:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:36:44 +0000 (13:36 +0100)
commit5dbcc46d41568d8afbd1c1ebd414cfc9f6e8be72
tree3fbb25ad6f72b3e5ac5c572208ba9e3bf728cb88
parentfec5c44478137a2efd8fc17a18941d50289bfae0
parent55bf20170e957a6e19168a9b5cc682ac4260785d
Merge branch '2016.11' into 2016.11-develop

Change-Id: I2a895a56625f088f4f90de41a9a8e00dad0dc530
14 files changed:
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Frontend/Cli.php
tine20/Addressbook/Model/Contact.php
tine20/Addressbook/Model/ContactFilter.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Felamimail/Controller/Account.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/Setup/Update/Release10.php
tine20/Felamimail/Setup/Update/Release9.php
tine20/Felamimail/Setup/setup.xml
tine20/Felamimail/js/Model.js
tine20/Tinebase/Controller/ScheduledImport.php
tine20/Tinebase/js/ux/form/ImageField.js
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js