Merge branch 'pu/2013.10-favoritesacl' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 13:16:28 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 13:16:28 +0000 (14:16 +0100)
commita33e39509e172023a874e99c399dc1db6b9a3252
tree47268846264c141b96f16a424baab87e057deef3
parent29ecef6246a0c9781c729f4a61ebe4ae96cfa236
parentbc95a58bf6f3fffafb8e8c19b343ad6c0e3d1c99
Merge branch 'pu/2013.10-favoritesacl' into 2013.10

Conflicts:
tine20/Felamimail/Setup/Initialize.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I3191101f7839af8a29b957c86022c497a8c86186
15 files changed:
tine20/Courses/Controller/Course.php
tine20/Courses/Setup/Initialize.php
tine20/Felamimail/Setup/Initialize.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/Inventory/Setup/Initialize.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/js/Models.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot