Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:33:37 +0000 (15:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:33:37 +0000 (15:33 +0100)
commit326474dd6699cc6721931ff69543000ad0913078
tree7e49f177bd161309ded48bbb11843e427fb9433e
parent1bf2509c51745a501722686712ed8301fb737e22
parentffa794ed7a81d034342f248350431f95a841c3c5
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Tinebase/Relations.php

Change-Id: I918e6a1c3784ec44d48c042fd63fb50fe286e546
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Tinebase/AllTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Crm/Controller/Lead.php
tine20/Tinebase/Relations.php
tine20/Tinebase/User.php
tine20/Tinebase/User/Sql.php
tine20/composer.json