Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:29:32 +0000 (17:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:29:32 +0000 (17:29 +0100)
commite56f61c553c771ff86a6bdba3b5d47c0bf2efcae
tree0ced040f92e31475402e2992d86085bc2fde92b0
parente298a994b9b320b4394ca998005f297c83014273
parenta1c5bebf6ad8cc90de5032776338d84c27f32559
Merge branch '2015.11' into 2015.11-develop

Change-Id: Ib86f46539f5d05106be1042b7adf38766d74ba54
tine20/Admin/Frontend/Json.php
tine20/Calendar/Backend/Sql.php
tine20/Filemanager/js/NodeTreePanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/js/widgets/container/ContainerSelect.js