Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:22:50 +0000 (13:22 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:22:50 +0000 (13:22 +0100)
commit9937ba99ebd586df4e8a0e99eaa61fca32d44baa
tree3de923eeff4d46028cb2821342ffd7e2d52a677d
parentbf90769e639d2814a9c6c7ab403b055040db0067
parente4d37cba9b794bbea510615136ac98be47f2bca0
Merge branch '2015.11-develop' into 2016.11

Change-Id: Id27d5c3005ff9125f552548553d56b0328a44fe2
tine20/Calendar/Export/Ical.php
tine20/Expressomail/js/AddressbookGridPanelHook.js
tine20/Expressomail/js/Expressomail.js
tine20/composer.json
tine20/composer.lock