Merge branch 'docker-build' into osm/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:29:05 +0000 (08:29 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:29:05 +0000 (08:29 +0200)
commitb575d50ed85c325720c92c712434bbf40b64a759
treee4b65d699ef60dc2905cfdf3937f2d5ee128e801
parent584eb0cfda74b90840f9c500057fd3a958f8b853
parent22649a23c12c810d792c8c9f4f995d003f7e7507
Merge branch 'docker-build' into osm/master