Merge branch 'docker-build' into osm/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 12:33:27 +0000 (14:33 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 12:33:27 +0000 (14:33 +0200)
commit4558b0cf805eb6f6b3c998b61b3a66038510b882
tree4d9551f025e30ee76ed1434e4b6b44415a6485f4
parent410e0209ae4d558ffe8f81e167bbc8a45f837633
parent546d185a4eb80f4b0ee335715645a96ed79505bc
Merge branch 'docker-build' into osm/master