]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Sun, 14 Dec 2014 20:21:04 +0000 (21:21 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Sun, 14 Dec 2014 20:21:04 +0000 (21:21 +0100)
commit0a1fbee64b3c3b6caf0c210fe686637c25fa0b19
treef4a1a8db28e2435b3bee4b7b9e2aa8f16371dbf0
parentedc707281e71b89144a5758d0fda3394c39ea628
parent2dfff399c11e49a4c44025c370e998a6ed9254a9
Merge branch 'master' into develop

Conflicts:
extension/locale/de/vimfx.properties
Imprint / Impressum