Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:01 +0000 (10:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:01 +0000 (10:14 +0200)
commitbaa1c7894916cf87d878a5837bb40aafa7d21441
tree536504db0812d96a5e2b60031cce92d3063689ed
parent8b216b5df8fb8b429e7bf66cc5ffa4b8eb65dd68
parent538c57d98e67579d618fa3d9a31b4f304ffd2bf8
Merge branch '2015.11' into 2015.11-develop

Change-Id: I2e75d140ee646e5e8dc977d55deedc36f54d81c6
tine20/Addressbook/Model/Contact.php
tine20/Filemanager/Frontend/Download.php
tine20/Tinebase/Config.php
tine20/Tinebase/js/MainScreen.js
tine20/composer.lock