Merge pull request #23 from zinic/add-authors

This commit is contained in:
Solomon Hykes 2014-06-04 19:22:49 -07:00
commit ccc6a28f0f
2 changed files with 13 additions and 0 deletions

6
.mailmap Normal file
View File

@ -0,0 +1,6 @@
# Generate AUTHORS: git log --format='%aN <%aE>' | sort -uf
<solomon@dotcloud.com> <solomon.hykes@dotcloud.com>
<proppy@google.com> <proppy@aminche.com>
Aanand Prasad <aanand.prasad@gmail.com>
Ben Firshman <ben@firshman.co.uk>
John Hopper <john.hopper@jpserver.net>

7
AUTHORS Normal file
View File

@ -0,0 +1,7 @@
Aanand Prasad <aanand.prasad@gmail.com>
Ben Firshman <ben@firshman.co.uk>
Brendan Burns <bburns@google.com>
fermayo <fermayo@gmail.com>
John Hopper <john.hopper@jpserver.net>
Johan Euphrosine <proppy@google.com>
Solomon Hykes <solomon@docker.com>