Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jul 2015 11:11:37 +0000 (13:11 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jul 2015 11:11:37 +0000 (13:11 +0200)
commit6e94b8cd4e57dc8c8fbd4d7fe3cbc080ab53a8f6
treeaf72e744ac663411804c5ab1774178c440012783
parent1edadaf1b34f56f26bf69206390fb8e05613b8cf
parentd0ddf46343927b6e1b4f459450b2b6fc7b6fe881
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Calendar/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml

Change-Id: I85f41a45a0908c6f0172ab578f42d68cbb049e80
tine20/Calendar/Config.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml