Rollup merge of #69070 - Bassetts:master, r=alexcrichton

JohnTitor · web-flow · commit 77a324508e2f · 2020-02-12T18:55:49.000+09:00
Add self to .mailmap
diff --git a/.mailmap b/.mailmap
@@ -114,6 +114,7 @@ James Deng <cnjamesdeng@gmail.com> <cnJamesDeng@gmail.com>
 James Miller <bladeon@gmail.com> <james@aatch.net>
 James Perry <james.austin.perry@gmail.com>
 Jason Fager <jfager@gmail.com>
+Jason Liquorish <jason@liquori.sh> <Bassetts@users.noreply.github.com>
 Jason Orendorff <jorendorff@mozilla.com> <jason.orendorff@gmail.com>
 Jason Orendorff <jorendorff@mozilla.com> <jason@mozmac-2.local>
 Jason Toffaletti <toffaletti@gmail.com> Jason Toffaletti <jason@topsy.com>

-Original file line number
+Diff line change
 James Miller <[email protected]> <[email protected]>
 James Perry <[email protected]>
 Jason Fager <[email protected]>
 +Jason Liquorish <[email protected]> <[email protected]>
 Jason Orendorff <[email protected]> <[email protected]>
 Jason Orendorff <[email protected]> <[email protected]>
 Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>