Merge branch 'docker-build' into osm/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 14:49:34 +0000 (16:49 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 14:49:34 +0000 (16:49 +0200)
commit584eb0cfda74b90840f9c500057fd3a958f8b853
tree94be6b189b33001deec82ccd3dbb75576c51f60d
parent4558b0cf805eb6f6b3c998b61b3a66038510b882
parent5b9096ef3f5f4c9caf56a223cfbddb7e8f445d60
Merge branch 'docker-build' into osm/master