Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Oct 2014 08:53:58 +0000 (10:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Oct 2014 08:53:58 +0000 (10:53 +0200)
commit0b00e8412bf99b3bf4d790ab30090e42bdef9834
tree2f4a65659d8c88a907623d542b68edd58ae4063c
parent8721c7ebc2756b31d220929137d5ca486320d8de
parent39a270ddca590111a7a9e4a025f9dd7019b436ca
Merge branch '2013.10' into 2014.09

Conflicts:
tests/tine20/Tinebase/Acl/RolesTest.php
tine20/Crm/js/LeadGridPanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Controller.php

Change-Id: I4c40fed17e17b42fa85fe45d67d912887fbe229d
20 files changed:
tests/tine20/ActiveSync/Controller/CalendarTests.php
tests/tine20/Admin/JsonTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Tinebase/Acl/RolesTest.php
tine20/ActiveSync/Controller/Abstract.php
tine20/ActiveSync/Controller/Calendar.php
tine20/Admin/Frontend/Json.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Crm/Model/LeadFilter.php
tine20/Crm/js/LeadGridPanel.js
tine20/Crm/js/Model.js
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Server/WebDAV.php
tine20/Voipmanager/Setup/setup.xml