Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:02:44 +0000 (12:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:02:44 +0000 (12:02 +0200)
commitfedb255f8c9d5d5128ce7455abdde9ff9c562bf8
treedd5fe91f3f225a8a706b9dcc23d80f5de37914ea
parent2fb299056403250fc73cbe3ea2d98298f90cabd5
parenteeb4ce05bd16024e9f1eb8731e6ed5edfd097ad9
Merge branch '2015.11' into 2015.11-develop

Change-Id: I353deb0a3615e2acb3ae4cf1b3b43625b3ff60be
12 files changed:
tests/tine20/Filemanager/Frontend/JsonTests.php
tests/tine20/Tinebase/Frontend/CliTest.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller.php
tine20/Calendar/Controller/Event.php
tine20/Setup/Controller.php
tine20/Tinebase/Application.php
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/User/Abstract.php