Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Jul 2015 14:28:20 +0000 (16:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Jul 2015 14:28:20 +0000 (16:28 +0200)
Conflicts:
tine20/Tinebase/Config/Abstract.php

Change-Id: I24022932c9b240f813598bebc4ae25defb2023df

1  2 
tests/tine20/Tinebase/Frontend/JsonTest.php
tine20/Timetracker/js/TimeaccountEditDialog.js
tine20/Timetracker/js/TimesheetEditDialog.js
tine20/Tinebase/Config/Abstract.php

Simple merge