Merge branch 'pu/2013.10-downloadlink' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:10:59 +0000 (10:10 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:10:59 +0000 (10:10 +0100)
commit7110d79ff69f55b1475f383d12a521bc82d70e21
tree593bbd75d976cca450029ab8c924a0475a3e9e2c
parent07348b0ca57544384101243c2e36bf76c3543b61
parent66a6ca4dbebd5484835428320f3f73a2f658f66f
Merge branch 'pu/2013.10-downloadlink' into 2013.10

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

Change-Id: I8ed2bfbee9d88ea1822e9ebac38fe8e50a349aa2
tine20/Filemanager/js/NodeEditDialog.js
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot
tine20/Tinebase/Model/Tree/Node.php
tine20/Tinebase/Server/Http.php