Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:11:07 +0000 (16:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:11:07 +0000 (16:11 +0100)
commit198ba1a4d69f78bd5caa92daa5bba3e0507ee14f
tree7ac912e25bbf96ccd6e1c25cb10d24f9f4cd6500
parentabdc64fec26c623ca142f90d9958537ee7dc1ff9
parent0176791f08061ba026611fbaba28b53044ecec55
Merge branch '2016.11' into 2016.11-develop

Change-Id: I1d39586d66015235f2b1eaadd61cb5d12dab9079
tine20/Filemanager/js/NodeTreePanel.js
tine20/Phone/Setup/Update/Release9.php