Merge branch '2016.11-develop' into 2017.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:16:42 +0000 (12:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:16:42 +0000 (12:16 +0200)
commit6f4f04e8435265a7a9d59d6e8278443a2375f022
tree608ed324555606b56ac769685e177353b4ec03a6
parent2a0e10d9f7515da962963b6abf3c99da1cca5d78
parent7c8d3790b4f785ad2e772637ef051a2e38c5b193
Merge branch '2016.11-develop' into 2017.11