Merge branch 'docker-build'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:27:51 +0000 (08:27 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:27:51 +0000 (08:27 +0200)
commit219a93c957ab49203cf8fdc54a4a4953022a28a9
tree9805b70618012b8861ab8bea72ba3bb8f6a27059
parent541f55014d1cffe4b938b3b65961d0efa23a6e1c
parent22649a23c12c810d792c8c9f4f995d003f7e7507
Merge branch 'docker-build'