Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:47:38 +0000 (13:47 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:47:38 +0000 (13:47 +0100)
commitd3eb3c6ea2b93364fb7b797939fb8e0b4c6d99d4
tree43ebf8590c627bb545ba4b6e1f5c5404a309eb2a
parent8b408e6e7b95568c9ab0bc1bd87a4250aeda57d7
parent18739df2219c1f6c06b2e61953ebeb37b15c06e2
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Sales/translations/de.po
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/User.php
tine20/Tinebase/js/LoginPanel.js

Change-Id: I85c9c16281c11702c4ef2bce6c9da60c48d2e9f6
20 files changed:
tests/tine20/Admin/JsonTest.php
tests/tine20/Tinebase/Frontend/CliTest.php
tine20/ActiveSync/Config.php
tine20/Addressbook/Config.php
tine20/Admin/Frontend/Json.php
tine20/Calendar/Config.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Attender.php
tine20/Sales/js/SupplierEditDialog.js
tine20/Sales/translations/de.po
tine20/Setup/Backend/Mysql.php
tine20/Tinebase/Config.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/Tinebase.jsb2
tine20/composer.json