]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Wed, 18 Nov 2015 14:49:01 +0000 (15:49 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Wed, 18 Nov 2015 14:51:19 +0000 (15:51 +0100)
commite75f132cbe7486d84bc4c428ffd795ce03b56fa5
tree3f2841cdefd6933147d15fe34887f98a16fef2f1
parent0a478248ee512adb807cad05a4d9ff2e60290824
parentf405054c65335d8bd068e89a16716a418715f5f9
Merge branch 'master' into develop

Conflicts:
extension/lib/utils.coffee
extension/lib/events-frame.coffee
extension/lib/utils.coffee
Imprint / Impressum