]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Mon, 30 Nov 2015 12:50:38 +0000 (13:50 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Mon, 30 Nov 2015 12:50:38 +0000 (13:50 +0100)
commitfbac0635792029270af56bb33bc53cbc3003138b
treeffd19a51025e9eb73cfbb780fe0d0f81ebe61522
parent893a10499cf06aca22eb72c9b4b8ac30a8a99dfc
parent45dfd61e3c62997a49658f2d8bc47349411308ad
Merge branch 'master' into develop

Conflicts:
documentation/config-file.md
documentation/config-file.md
extension/lib/vimfx.coffee
Imprint / Impressum