Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 14:45:18 +0000 (15:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 14:45:18 +0000 (15:45 +0100)
commit44b7bbb903d172cdb3bb6efeb8bba6f822251bc3
tree01a34e72cb7239e83a1e085dd9bf726f11e5f5a4
parente10c0f7c6e8a8ab2745c35afaf1852605344da9f
parentd32a9dc1d55c0c6d3cbee7ae21f965d32fde81c0
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/Frontend/WebDAV/Event.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Core.php
tine20/Tinebase/User/Abstract.php

Change-Id: I802c8cb9d54ad4dbf43f0bc0f8d5645d399b84f1
13 files changed:
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Courses/JsonTest.php
tine20/Admin/Controller/User.php
tine20/Admin/Import/User/Csv.php
tine20/Calendar/Frontend/WebDAV/Event.php
tine20/Calendar/Model/Attender.php
tine20/Courses/Controller/Course.php
tine20/Courses/Setup/Initialize.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Core.php
tine20/Tinebase/Model/FullUser.php
tine20/Tinebase/User/Abstract.php