]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Sun, 22 Nov 2015 12:27:23 +0000 (13:27 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Sun, 22 Nov 2015 12:27:23 +0000 (13:27 +0100)
commitd2c82e794a94eb8305dda402d5d0e95344831760
treefa43d343911c537c4c728ef9fc65c1aa6d29c0d8
parent4f3195c8bb9e536557a8f3916d679929a4bf5eca
parent6ceb812716f03fd14d223a226fb9382602da0ebf
Merge branch 'master' into develop

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