Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:36:46 +0000 (13:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:36:46 +0000 (13:36 +0100)
commit18739df2219c1f6c06b2e61953ebeb37b15c06e2
tree1076a80250115cd9df224f3d2ecd90154f989e6e
parenta00338068e9d44432d962073b104d7a82e3a28ad
parent9b55f23a57cff274dd8b42d66606b4c66f455b46
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/Core.php
tine20/composer.lock

Change-Id: Ife9bc84cac193b8e09c487f75f64861867d65cdb
tine20/Calendar/Controller/Event.php
tine20/Tinebase/Config.php
tine20/Tinebase/Controller.php
tine20/Tinebase/Core.php
tine20/Tinebase/User.php
tine20/Tinebase/js/LoginPanel.js
tine20/composer.json
tine20/composer.lock