Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Oct 2015 09:39:07 +0000 (11:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Oct 2015 09:39:07 +0000 (11:39 +0200)
commit1ee6abe44a509a4bb23eeac1e530aa605eeea7cc
tree7fb150f51295b2317059594b58d56f3e332235af
parent67cb4f9c4ca361f89b0c6fa4901ea485b374faa1
parentb94226ea2dd6550f0e7bfb64c682d35a7f3ece6b
Merge branch '2013.10' into 2014.11
tests/tine20/Filemanager/Frontend/JsonTests.php
tine20/Filemanager/Controller/Node.php