Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 22 Sep 2014 09:27:27 +0000 (11:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 22 Sep 2014 09:27:27 +0000 (11:27 +0200)
commitd7f7e8b6d04409e5f2f947e7940c2afd899bed08
tree0db3e51422236ca57ea1c7019a60d08a3fcec03a
parenteed4a58c1fbf83e7e01524fcb23e891e2ba5d83f
parent7534d4c2a51d0044cfe3f1f70d1bcf46501b22b9
Merge branch '2013.10' into 2014.09

Conflicts:
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Felamimail/Setup/Initialize.php
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot

Change-Id: Ibe7136f9b7b43ccae5ab7fa362d82b5b68a208cc
13 files changed:
scripts/packaging/fedora/SPECS/tine20.spec
tests/tine20/Calendar/Controller/RecurTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Courses/Controller/Course.php
tine20/Felamimail/Controller/Message.php
tine20/Felamimail/Setup/Initialize.php
tine20/Filemanager/js/NodeEditDialog.js
tine20/Filemanager/translations/template.pot
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/User.php