diff options
| author | Phil Crosby | 2014-04-30 00:42:42 -0700 |
|---|---|---|
| committer | Phil Crosby | 2014-04-30 00:42:42 -0700 |
| commit | fc23be221270dc11914244f5c93d900ad8e9225c (patch) | |
| tree | 9d676401ce359a28ef76a552e514db590cee3ecd /git_hooks | |
| parent | fa16722613cd60933258edac2c0aa1908fe387bd (diff) | |
| parent | db65721aa67b2de75b1e279f01e721676e83b448 (diff) | |
| download | vimium-fc23be221270dc11914244f5c93d900ad8e9225c.tar.bz2 | |
Merge branch 'smblott-github-sync-chrome-instances'
Conflicts:
tests/unit_tests/utils_test.coffee
Diffstat (limited to 'git_hooks')
0 files changed, 0 insertions, 0 deletions