diff options
| author | jez | 2011-01-31 10:37:29 +0800 |
|---|---|---|
| committer | jez | 2011-01-31 10:43:29 +0800 |
| commit | 3f34de770e11b41183e914a7fd7e66a4ac877730 (patch) | |
| tree | 9182f9066b1e64855568c995dd590e253e3907aa /CREDITS | |
| parent | 761ce574cf63cd5cea299e1dad917a459c572cbf (diff) | |
| parent | 35d58590b0e09e88c92ca3d49b5ba3b1ff622665 (diff) | |
| download | vimium-3f34de770e11b41183e914a7fd7e66a4ac877730.tar.bz2 | |
Merge branch 'master' into filter-hints
Conflicts:
CREDITS
commands.js
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -7,6 +7,7 @@ Contributors: akhilman Bill Mill (github: llimllib) Branden Rolston <brolston@gmail.com> (github: branden) + Christian Stefanescu (github: stchris) ConradIrwin drizzd int3 @@ -20,5 +21,6 @@ Contributors: Werner Laurensse (github: ab3) Svein-Erik Larsen <feinom@gmail.com> (github: feinom) Bill Casarin <jb@jb55.com> (github: jb55) + R.T. Lechow <rtlechow@gmail.com> (github: rtlechow) Feel free to add real names in addition to GitHub usernames. |