Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Dec 2016 14:57:04 +0000 (15:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Dec 2016 14:57:04 +0000 (15:57 +0100)
commitcbd4dcba13db09ae77504b6aae5993d561d2a780
tree518b7c31e20b8cb3533515fac7988d6ca7fc00b2
parent24d333aedcd2171de8cab8f3c10074ab3aeaa68f
parent76201c192c0296cb40b8293b72401078c3f1e654
Merge branch '2016.11' into 2016.11-develop
tine20/Calendar/Controller/EventNotifications.php
tine20/Felamimail/Controller/Account.php
tine20/Phone/Setup/Update/Release9.php
tine20/Setup/Controller.php
tine20/Tinebase/js/common.js