Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:19 +0000 (17:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:19 +0000 (17:38 +0100)
commit43a9323aac8d407ba4af6436a46cbb47c617b72f
tree38879762e3ceb28c71f51341102f0962ae74fa9b
parent07291bed7f1caaee7eb8cdd6244f3f2623eb2c62
parenta3a9ce408c6114c018de005b4230c14c677e1762
Merge branch '2016.11' into 2016.11-develop
12 files changed:
tine20/Addressbook/Controller/Contact.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Filemanager/js/NodeTreePanel.js
tine20/Tinebase/Auth/CredentialCache.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Json/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/WebDav/Container/Abstract.php
tine20/Tinebase/js/widgets/container/ContainerSelect.js
tine20/Tinebase/js/widgets/grid/GridPanel.js