Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 20 Oct 2016 11:34:18 +0000 (13:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 20 Oct 2016 11:34:18 +0000 (13:34 +0200)
1  2 
tine20/Filemanager/Frontend/Download.php
tine20/Tinebase/Setup/DemoData/Abstract.php