Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:50:31 +0000 (08:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:50:31 +0000 (08:50 +0100)
commit95c320b382ed7b6852917d2ef147c034ddb3b139
treec4e843e9eea19750a74c998adbd2e4238de152ee
parentd5eb473a2090517c0f4fee28c04fe277d16d6166
parente283c3b2e11112ee9ba746e5d656f87cedcff77c
Merge branch '2015.11' into 2015.11-develop
tine20/Filemanager/Frontend/Download.php
tine20/Filemanager/js/NodeTreePanel.js