projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 410e020 546d185)
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)

Trivial merge