Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Nov 2016 14:42:52 +0000 (15:42 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Nov 2016 14:42:52 +0000 (15:42 +0100)
commit7852c2f0cbb616483deb31fa381b53e1bd9b3207
tree4bb7b358db6b21898c9522c53b4c175ef3d36d35
parent83515488d0707f43c35dd8490f86721a9f2bf84b
parent3ebe5a62c56afa6976bb0745bd2de3674044b5a1
Merge branch '2015.11' into 2015.11-develop

Change-Id: Ic9a4d3e4a88e8816212daf0f0f7a15967fa3bc03
tine20/Addressbook/Controller.php
tine20/Calendar/Controller.php
tine20/Tinebase/Container.php
tine20/Tinebase/Model/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml