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)
commita2af6f970ac62ce253040cadeb03881062fca85f
treefc9b6bdbcf2992d6a4e28f7b54f612c204f80fde
parent271a4cb1fb5868d91b033e1166a1f1951d44227f
parent724d45311cff7fa4c14dd92097c72d144b037d51
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Tinebase/Config/Abstract.php

Change-Id: I24022932c9b240f813598bebc4ae25defb2023df
tests/tine20/Tinebase/Frontend/JsonTest.php
tine20/Timetracker/js/TimeaccountEditDialog.js
tine20/Timetracker/js/TimesheetEditDialog.js
tine20/Tinebase/Config/Abstract.php