projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dedcaf7 c13e49d)
Merge remote-tracking branch 'upstream/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 19 Aug 2016 13:08:23 +0000 (15:08 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 19 Aug 2016 13:08:23 +0000 (15:08 +0200)
1  2 
Vagrantfile patch | diff1 | diff2 | blob | history

diff --cc Vagrantfile
Simple merge