Merge branch '2016.11-develop' into 2017.02
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:54:15 +0000 (13:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:54:15 +0000 (13:54 +0200)
commit8a9aa6a73eef3be6a28abffdc66ed711dcbb98a6
tree2500ca35bd8874592f569f12d18d6b396da7ea66
parent9bd10b1a6c680ea7aa1f4f0059cd3f60071aa458
parent2a6c3588b06d6147df159abb20bdf7be56c713d0
Merge branch '2016.11-develop' into 2017.02

Change-Id: I2344be996d4681f8b8c39d4167d8a9e7837a9b14
tests/tine20/Tinebase/ApplicationTest.php
tine20/Addressbook/js/ContactGrid.js
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Felamimail/Config.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Timetracker/Frontend/Json.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Preference/Abstract.php
tine20/Tinebase/WebDav/Container/Abstract.php