Merge branch 'pu/2013.10-filemanager'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Sep 2014 10:16:54 +0000 (12:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Sep 2014 10:16:54 +0000 (12:16 +0200)
commit8853098f7e4ec91072d346032102b342abd131a8
treefbdaa72241aed313947e25ce21839b0f55bd365b
parent5333b401ad490a998c7762572ab80c7442580d74
parent386d421a6fa918c7dbbe2e3776cd716afa9cbf98
Merge branch 'pu/2013.10-filemanager'

Conflicts:
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot

Change-Id: I0dff687be6daf88f92f85a97439db98fbad1210d
tests/tine20/Filemanager/Frontend/JsonTests.php
tine20/Filemanager/Filemanager.jsb2
tine20/Filemanager/js/NodeGridPanel.js
tine20/Filemanager/js/NodeTreePanel.js
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot
tine20/Tinebase/FileSystem.php