Merge branch '2017.11' into 2017.11-develop 2017.08.1
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:17:09 +0000 (12:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:17:09 +0000 (12:17 +0200)
commit983e4928555b5610daaf0e4f887be5654fa04664
treea448e1307ec19f6a2af11e92bfdd1e5e12615c97
parent0711f17d9b27a4ce935a802230be4f1953900015
parent6f4f04e8435265a7a9d59d6e8278443a2375f022
Merge branch '2017.11' into 2017.11-develop