]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Mon, 26 Jan 2015 16:03:52 +0000 (17:03 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Mon, 26 Jan 2015 16:03:52 +0000 (17:03 +0100)
commit055bd3674a6011a88c5138d41deb313f69b2e4ec
treefb03312cdc416deaf0a4afdd2228f7566a36cea8
parent6ba3eb88e883d330e90adfd4b1e2e5cef7deebcf
parent99f79102ce3f93a79533321a7b7f3d549784bc98
Merge branch 'master' into develop

Conflicts:
README.md
CONTRIBUTING.md
Imprint / Impressum