Merge branch 'pu/2013.10-caldav'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Sep 2014 12:40:38 +0000 (14:40 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Sep 2014 12:40:38 +0000 (14:40 +0200)
commit9dac05197e3f8da892cfc790fe962e0b1ef36b6c
tree9e1bb10948228c9d13490725af2162589fa8fbbc
parent5ddea31587fe4e1a3c68a9def06840be6db13222
parente4de507d3d2cbf54e48fdcd77f9cde5163ca545a
Merge branch 'pu/2013.10-caldav'

Conflicts:
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/Calendar/Import/CalDAV/ClientMock.php
tests/tine20/Calendar/Import/CalDAVTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/Model/AttenderTests.php
tests/tine20/Calendar/TestCase.php
tests/tine20/Felamimail/Frontend/WebDAVTest.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Calendar/Import/CalDav/Client.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Tinebase/Container.php

Change-Id: Ic1fdac05e2ffb5cd300771639a905586bba90949
14 files changed:
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/TestCase.php
tests/tine20/Phone/JsonTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Tinebase/Container.php