Skip to content

Commit 0837260

Browse files
committed
Update .mailmap based on feedback.
1 parent 53603be commit 0837260

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

.mailmap

+16-12
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
2323

2424
Cimarron Mittelsteadt <[email protected]> Cimarron <[email protected]>
2525

26-
DanHickstein <[email protected]>
26+
Conner R. Phillips <[email protected]> <conner.r.phillips.com>
27+
28+
Dan Hickstein <[email protected]>
2729

2830
Daniel Hyams <[email protected]>
2931
Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
@@ -41,9 +43,9 @@ Erik Bray <[email protected]> <[email protected]>
4143
4244
4345

44-
46+
Filipe Fernandes <[email protected]>
4547

46-
Florian LB <[email protected]>
48+
Florian Le Bourdais <[email protected]>
4749

4850
Francesco Montesano <[email protected]> montefra <[email protected]>
4951

@@ -53,7 +55,8 @@ Hans Moritz Günther <[email protected]>
5355

5456
5557

56-
Jack Kelly <[email protected]> Jack (aka Daniel) Kelly <[email protected]>
58+
59+
5760

5861
Jaime Fernandez <[email protected]>
5962

@@ -97,7 +100,7 @@ Lennart Fricke <[email protected]> <[email protected]>
97100

98101
Levi Kilcher <[email protected]>
99102

100-
Lion Krischer <[email protected]>
103+
101104

102105
Martin Fitzpatrick <[email protected]> <[email protected]>
103106

@@ -106,8 +109,8 @@ Matthew Emmett <[email protected]> <[email protected]>
106109

107110
Matthias Bussonnier <[email protected]>
108111

109-
110-
112+
Matthias Lüthi <[email protected]>
113+
111114

112115
Michael Droettboom <[email protected]> <[email protected]>
113116
Michael Droettboom <[email protected]> Michael Droettboom <mdboom@debian-vm>
@@ -121,8 +124,6 @@ Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]
121124
122125
123126

124-
Moritz Beyreuther <[email protected]>
125-
126127
Nelle Varoquaux <[email protected]>
127128

128129
Nic Eggert <[email protected]> Nic Eggert <[email protected]>
@@ -150,15 +151,16 @@ Phil Elson <[email protected]> <[email protected]>
150151

151152
productivememberofsociety666 <[email protected]> none <[email protected]>
152153

153-
154-
155154
156155

157156
Scott Lasley <[email protected]>
158157

158+
Sebastian Raschka <[email protected]>
159+
160+
159161
160162

161-
163+
Slav Basharov <[email protected]>
162164

163165
164166

@@ -170,6 +172,8 @@ Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
170172
Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
171173
Thomas A Caswell <[email protected]> Thomas A Caswell <“[email protected]”>
172174

175+
Trish Gillett-Kawamoto <[email protected]> <[email protected]>
176+
173177
Werner F Bruhin <[email protected]>
174178

175179
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>

0 commit comments

Comments
 (0)