]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Thu, 22 Jan 2015 16:12:00 +0000 (17:12 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Thu, 22 Jan 2015 16:12:00 +0000 (17:12 +0100)
commit41d2831b37316ef196b8e41a5ecf05ecc0e587d1
treec01afebfbbdc154fd6583781ba9368b60252d1ea
parenteb8e79fe1793fdc824fa578f9e54647682dffcdf
parent131dca6254f36de1ebdbc20e640b052f45e71212
Merge branch 'master' into develop

Conflicts:
CHANGELOG.md
extension/install.rdf
CHANGELOG.md
package.json
Imprint / Impressum