Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:21 +0000 (12:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:21 +0000 (12:08 +0100)
commitacded5de07ebbc446ba999f8218c022456964217
tree0f54c9652faebcf8ddb3107f6770f095d2b157ca
parent41cde627faed123a74f63431d3d58e5c545b46dd
parent08885672664b591957b8644a33806a805e440e35
Merge branch '2014.11-develop' into 2015.11
tests/tine20/TestCase.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/Model.js
tine20/Tinebase/AccessLog.php
tine20/Tinebase/Backend/Sql/Command/Pgsql.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller.php