diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-02 21:22:20 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-02 21:22:20 +0800 |
| commit | 1e60919d47ac2767706c135332a1a4f79bbf3960 (patch) | |
| tree | 3db2f5d5446f451d700bf67ef756d85da0fdda25 /.mailmap | |
| parent | 313cfba7d43529db647789ae826bc426d9da7de3 (diff) | |
| parent | 0d97c3ce1322083fb9683a5afec004b2626b620a (diff) | |
| download | dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar.gz dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar.bz2 dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar.lz dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar.xz dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.tar.zst dexon-1e60919d47ac2767706c135332a1a4f79bbf3960.zip | |
Merge pull request #3 from ethereum/develop
Update to develop
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..cc9834bb9 --- /dev/null +++ b/.mailmap @@ -0,0 +1,12 @@ +Jeffrey Wilcke <jeffrey@ethereum.org> +Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com> +Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com> +Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@users.noreply.github.com> + +Viktor Trón <viktor.tron@gmail.com> + +Joseph Goulden <joegoulden@gmail.com> + +Nick Savers <nicksavers@gmail.com> + +Maran Hidskes <maran.hidskes@gmail.com>
\ No newline at end of file |