beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #32185 from ewindisch/mailmap

Browse source 
Update Erica in mailmap
This commit is contained in:
Sebastiaan van Stijn 2017-03-28 22:02:35 +02:00 committed by GitHub
commit 8098bf3896
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.mailmap
View file

@ -131,7 +131,8 @@ Francisco Carriedo <fcarriedo@gmail.com>
<baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
Brian Goff <cpuguy83@gmail.com>
<cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
<eric@windisch.us> <ewindisch@docker.com>
Erica Windisch <erica@windisch.us> <ewindisch@docker.com>
Erica Windisch <erica@windisch.us> <eric@windisch.us>
<frank.rosquin+github@gmail.com> <frank.rosquin@gmail.com>
Hollie Teal <hollie@docker.com>
<hollie@docker.com> <hollie.teal@docker.com>

2
AUTHORS
View file

@ -486,7 +486,7 @@ Eric Paris <eparis@redhat.com>
Eric Rafaloff <erafaloff@gmail.com>
Eric Rosenberg <ehaydenr@users.noreply.github.com>
Eric Sage <eric.david.sage@gmail.com>
Eric Windisch <eric@windisch.us>
Erica Windisch <erica@windisch.us>
Eric Yang <windfarer@gmail.com>
Eric-Olivier Lamey <eo@lamey.me>
Erik Bray <erik.m.bray@gmail.com>