Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 16:14:16 +0000 (18:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 16:14:16 +0000 (18:14 +0200)
commit70939b8e40328d28e55ae2bc9d39012d8cbd1031
tree6128ba99b3cae8694572c8d24173795133d4074e
parent34a333063bb4e2c62cb1da68deffee6b23accf8b
parent2e7ea295ab2a7ea9c44a0536adbf6f5f428db02c
Merge branch '2017.11' into 2017.11-develop