Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Sep 2015 10:37:18 +0000 (12:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Sep 2015 10:37:18 +0000 (12:37 +0200)
commit2f15baf8e54162c028303eaf972fbffc7d4898c1
tree9b8bce08b18837dd5d754a10979a03ce0270dcfc
parent863c6d4c80038b5951588f785537ca8bd99e56e5
parent34420f26422a63e0f7809e3ce8722f39e76943f7
Merge branch '2014.11-develop' into 2015.07

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

Change-Id: I53d895d8432d24672f7c11b2fd53239c4e1fb3d0
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/ResourceEditDialog.js
tine20/Calendar/translations/de.po
tine20/Crm/Setup/Update/Release8.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Frontend/Http.php