Merge branch '2016.11' into 2016.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:48:27 +0000 (16:48 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:48:27 +0000 (16:48 +0200)
1  2 
tine20/composer.json

Simple merge