Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:21:45 +0000 (13:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:21:45 +0000 (13:21 +0100)
commite4d37cba9b794bbea510615136ac98be47f2bca0
tree5f9d76b0461d81ce7771d4223377fdc42fa0e2c8
parent5f2cda17ab42d3e151f3d47d92094d3f901d5a94
parent29323ee2554184fde20a9f267230af6e1e9f7e4f
Merge branch '2015.11' into 2015.11-develop

Change-Id: I7b23b99cca3a3fe05263b90f9a5075d027c440e1
12 files changed:
tine20/Addressbook/Model/Contact.php
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller.php
tine20/Calendar/js/AttendeeGridPanel.js
tine20/Expressomail/js/AddressbookGridPanelHook.js
tine20/Expressomail/js/Expressomail.js
tine20/Felamimail/js/Felamimail.js
tine20/Felamimail/js/GridPanel.js
tine20/Felamimail/js/GridPanelHook.js
tine20/Tinebase/Controller/ScheduledImport.php
tine20/composer.json
tine20/composer.lock