Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:04:53 +0000 (12:04 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:04:53 +0000 (12:04 +0200)
1  2 
tests/tine20/Filemanager/Frontend/JsonTests.php
tests/tine20/Tinebase/Frontend/CliTest.php
tine20/Calendar/Controller/Event.php
tine20/Setup/Controller.php
tine20/Tinebase/Application.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Core.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge