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)
commit4801308bf1d6e6a58ea8a42feea51312659712d8
tree7b76f8e2db46086288da05891f429d5707c97ddf
parentcedc4d391fa8dc8eecfa9e534cb56dd396d54cc5
parent65c768a185ba22144faf8c4df89aa0a092d21ab1
Merge branch '2015.11' into 2015.11-develop
tine20/Filemanager/Frontend/Download.php
tine20/Tinebase/Setup/DemoData/Abstract.php