Преглед на файлове

Merge pull request #32185 from ewindisch/mailmap

Update Erica in mailmap
Sebastiaan van Stijn преди 8 години
родител
ревизия
8098bf3896
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 2 1
      .mailmap
  2. 1 1
      AUTHORS

+ 2 - 1
.mailmap

@@ -131,7 +131,8 @@ Francisco Carriedo <fcarriedo@gmail.com>
 <baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
 <baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
 Brian Goff <cpuguy83@gmail.com>
 Brian Goff <cpuguy83@gmail.com>
 <cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
 <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>
 <frank.rosquin+github@gmail.com> <frank.rosquin@gmail.com>
 Hollie Teal <hollie@docker.com>
 Hollie Teal <hollie@docker.com>
 <hollie@docker.com> <hollie.teal@docker.com>
 <hollie@docker.com> <hollie.teal@docker.com>

+ 1 - 1
AUTHORS

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