Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 16:51:11 +0000 (18:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 16:51:11 +0000 (18:51 +0200)
commite28ef6c15ffab46178e6110e188e545cf8b32973
tree39d919fc1318b2e38f614a8af1ba93493e5e200c
parentf764249553400ce74c211f73f96fd211cfcff017
parentf13e9e95db7afc2a77a276979d306ffb33dfac31
Merge branch '2013.10'

Conflicts:
tests/tine20/Calendar/TestCase.php
tine20/Calendar/css/daysviewpanel.css
tine20/Calendar/css/print.css
tine20/HumanResources/Frontend/Json.php
tine20/Tinebase/js/ux/Printer/print.css

Change-Id: Ib999a6a9c4f0a338a01b1785634da30b168f6756
14 files changed:
tests/tine20/Calendar/Controller/ResourceTest.php
tests/tine20/Calendar/TestCase.php
tests/tine20/HumanResources/ControllerTests.php
tests/tine20/HumanResources/JsonTests.php
tine20/Calendar/css/daysviewpanel.css
tine20/Calendar/css/print.css
tine20/HumanResources/Frontend/Json.php
tine20/Setup/Update/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/Core.php
tine20/Tinebase/ImportExportDefinition.php
tine20/Tinebase/Setup/Initialize.php
tine20/Tinebase/js/ux/Printer/print.css
tine20/Tinebase/js/widgets/grid/GridPanel.js