Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:02:22 +0000 (14:02 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:02:22 +0000 (14:02 +0100)
commit740e26f0d307f6777a340bdfab8582e8b9713ee1
tree9148c2696c2098f897c889c411dfc48d4ce7e613
parentfbf136a2a5fbbd1446e0e6f3b2c363675942e9d0
parent9a365835489ea94bad084b76fa74dc2933b71e3e
Merge branch '2016.11' into 2016.11-develop

Change-Id: I1fbc1ed21b4b2f3d7fed47ccb700cf735feef2cc
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml