]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Fri, 23 Jan 2015 16:43:56 +0000 (17:43 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Fri, 23 Jan 2015 16:43:56 +0000 (17:43 +0100)
commit0f621752d38e67bb41e20af43f2ae5ecfc19a38d
treee00872b35714d0bec23abb6f070efde937d3fb9a
parent41d2831b37316ef196b8e41a5ecf05ecc0e587d1
parentbd20180c6cbcf043fb302d0af0ad494ae546f239
Merge branch 'master' into develop

Conflicts:
CHANGELOG.md
extension/install.rdf
CHANGELOG.md
CONTRIBUTING.md
extension/lib/utils.coffee
package.json
Imprint / Impressum