Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:39:15 +0000 (10:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:39:15 +0000 (10:39 +0200)
commit34a333063bb4e2c62cb1da68deffee6b23accf8b
treef1a50edde5d1fef897e9b545c5d145e907b10390
parent16f68ad1a56f3a984479199c1d07a2d47f1fcdb5
parentb0b59cc3045f4ba9a185af745903c0f7998ef0bc
Merge branch '2017.11' into 2017.11-develop