Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:44:55 +0000 (14:44 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:44:55 +0000 (14:44 +0200)
commit12e02ecf607160b0b5a2abdaab60bc63b4cbca26
tree7b575f575913b5ff5b877a6119532df034fd11d5
parent69186cfdc3a3cd80d4b6ef71d88f7c1ec07d6897
parent9d7e3bc31cea6ee6c2d6c54ea694aeefa721a949
Merge branch '2015.11-develop' into 2016.03

Conflicts:
tine20/Calendar/Config.php
tine20/Expressomail/js/AclsGrid.js
tine20/Tinebase/js/LoginPanel.js

Change-Id: I180380d4528260ba3469dcacfe800ccced0b7c51
22 files changed:
tine20/Admin/js/user/EditDialog.js
tine20/Calendar/Config.php
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/Calendar.js
tine20/Expressodriver/js/ExceptionHandler.js
tine20/Expressodriver/js/NodeGridPanel.js
tine20/Expressomail/js/AccountEditDialog.js
tine20/Expressomail/js/AclsEditDialog.js
tine20/Expressomail/js/AclsGrid.js
tine20/Expressomail/js/ContactGrid.js
tine20/Expressomail/js/Expressomail.js
tine20/Expressomail/js/GridPanel.js
tine20/Expressomail/js/MessageEditDialog.js
tine20/Expressomail/js/Model.js
tine20/Expressomail/js/TreeContextMenu.js
tine20/Expressomail/js/sieve/RuleEditDialog.js
tine20/Felamimail/Controller/Account.php
tine20/Felamimail/Controller/Message.php
tine20/Filemanager/js/ExceptionHandler.js
tine20/Setup/Controller.php
tine20/Tinebase/js/LoginPanel.js
tine20/Tinebase/js/tineInit.js