docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #32185 from ewindisch/mailmap

Browse Source 
Update Erica in mailmap
Upstream-commit: 8098bf3896f5a60be65102d9e99161b601d5e3ab
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-03-28 22:02:35 +02:00
committed by GitHub
parent ea10b30ed8 e450737ae9
commit a79f00c9c4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/.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
components/engine/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>