Merge branch '2016.11-develop' into 2017.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:37:09 +0000 (10:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:37:09 +0000 (10:37 +0200)
commitb0b59cc3045f4ba9a185af745903c0f7998ef0bc
tree56fa143709f2cddee4e36064923d51040b913173
parentaccbb36a5783d3ebe39d937db4999924b0c5bb93
parent7a3ddb6a466e318ee92d5d00a561fdcb21b5e91b
Merge branch '2016.11-develop' into 2017.11