Rollup merge of #79343 - flip1995:mailmap, r=Mark-Simulacrum

jonas-schievink · web-flow · commit ea3c269b70ea · 2020-11-23T15:25:55.000+01:00
Add my (@flip1995) work mail to the mailmap
diff --git a/.mailmap b/.mailmap
@@ -230,6 +230,7 @@ Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
 Philipp Krones <hello@philkrones.com> flip1995 <hello@philkrones.com>
+Philipp Krones <hello@philkrones.com> <philipp.krones@embecosm.com>
 Philipp Matthias Schäfer <philipp.matthias.schaefer@posteo.de>
 Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
 Rafael Ávila de Espíndola <respindola@mozilla.com> Rafael Avila de Espindola <espindola@dream.(none)>

-Original file line number
+Diff line change
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Krones <[email protected]> flip1995 <[email protected]>
 +Philipp Krones <[email protected]> <[email protected]>
 Philipp Matthias Schäfer <[email protected]>
 Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
 Rafael Ávila de Espíndola <[email protected]> Rafael Avila de Espindola <espindola@dream.(none)>