Merge pull request #89 from angular/master

GulajavaMinistudio · web-flow · commit 6bd2e133d026 · 2017-11-24T11:10:07.000+07:00
Update upstream
diff --git a/.mailmap b/.mailmap
@@ -25,5 +25,5 @@ Shahar Talmi <shahar.talmi@gmail.com> <shahart@wix.com>
 Shyam Seshadri <shyamseshadri@google.com>
 Shyam Seshadri <shyamseshadri@google.com> <shyamseshadri@gmail.com>
 Vojta Jina <vojta.jina@gmail.com>
-Vojta Jina <vojta@gemin-i.org>
-Vojta Jina <vojta@google.com>
+Vojta Jina <vojta.jina@gmail.com> <vojta@gemin-i.org>
+Vojta Jina <vojta.jina@gmail.com> <vojta@google.com>

-Original file line number
+Diff line change
 Shyam Seshadri <[email protected]>
 Shyam Seshadri <[email protected]> <[email protected]>
 Vojta Jina <[email protected]>
 -Vojta Jina <[email protected]>
 -Vojta Jina <[email protected]>
 +Vojta Jina <vojta[email protected]> <vojta@gemin-i.org>
 +Vojta Jina <vojta[email protected]> <vojta@google.com>