Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Oct 2015 09:49:30 +0000 (11:49 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Oct 2015 09:49:30 +0000 (11:49 +0200)
commit9a2eddf4d49b37e057133a885e0a4807dbbead8c
tree7337d61c238a20633f87b047e23c70b1e607bba5
parentdd75e258294a581c86152aea21d29fd7e1fba3d6
parentc5784d6097ef004ba9da3b521a2a38baa1db0f02
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Felamimail/Setup/Update/Release8.php
tine20/Felamimail/Setup/setup.xml
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml

Change-Id: Iaa9ad8b8f18e53dcc468b92ca8525028cf95fa59
13 files changed:
tests/tine20/Filemanager/Controller/DownloadLinkTests.php
tests/tine20/TestCase.php
tests/tine20/Tinebase/AllTests.php
tests/tine20/Tinebase/ContainerTest.php
tine20/Felamimail/Setup/Update/Release8.php
tine20/Felamimail/Setup/Update/Release9.php
tine20/Felamimail/Setup/setup.xml
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/Timemachine/ModificationLog.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php