Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Nov 2014 17:23:02 +0000 (18:23 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Nov 2014 17:23:02 +0000 (18:23 +0100)
commit3cd35e28af462380e7698d1a084b0bd2b479883c
tree09186b8c341cb50114c21e6b9a226606b9f6fa13
parent44a393c2521e8ff75be94d6a5364168c05f153ea
parentba001331b45cbe732eba74332c13888975bf808f
Merge branch '2013.10' into 2014.09

Conflicts:
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Calendar/Import/ICalTest.php
tine20/Tinebase/Controller.php
tine20/Tinebase/Setup/setup.xml
tine20/composer.lock

Change-Id: If7c2d333cb69ea66646008060267289d04bad013
16 files changed:
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Calendar/Controller/ResourceTest.php
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/Import/ICalTest.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Frontend/Cli.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller.php
tine20/Tinebase/Core.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/composer.lock