MAINT: Update mailmap, Zenodo

effigies · effigies · commit 3994fa5d3b14 · 2019-08-02T06:23:35.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -45,6 +45,7 @@ Mathias Goncalves <mathiasg@mit.edu> mathiasg <mathiasg@mit.edu>
 Matthew Cieslak <mattcieslak@gmail.com> Matt Cieslak <mattcieslak@gmail.com>
 Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
+Michiel Cottaar <MichielCottaar@protonmail.com> Michiel Cottaar <MichielCottaar@protonmail.ch>
 Ly Nguyen <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
 Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
 Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
diff --git a/.zenodo.json b/.zenodo.json
@@ -197,6 +197,9 @@
     {
       "name": "Fauber, Bennet"
     },
+    {
+      "name": "Panfilov, Egor"
+    },
     {
       "affiliation": "McGill University",
       "name": "Poline, Jean-Baptiste",
@@ -249,6 +252,9 @@
       "name": "Gonzalez, Ivan",
       "orcid": "0000-0002-6451-6909"
     },
+    {
+      "name": "Palasubramaniam, Jath"
+    },
     {
       "name": "Lecher, Justin"
     },

-Original file line number
+Diff line change
 Matthew Cieslak <[email protected]> Matt Cieslak <[email protected]>
 Michael Hanke <[email protected]> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 Michael Hanke <[email protected]> <[email protected]>
 +Michiel Cottaar <[email protected]> Michiel Cottaar <[email protected]>
 Ly Nguyen <[email protected]> lxn2 <[email protected]>
 Oliver P. Hinds <[email protected]> ohinds <[email protected]>
 Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,9 @@`
`197`	`197`	`{`
`198`	`198`	`"name": "Fauber, Bennet"`
`199`	`199`	`},`
	`200`	`+ {`
	`201`	`+ "name": "Panfilov, Egor"`
	`202`	`+ },`
`200`	`203`	`{`
`201`	`204`	`"affiliation": "McGill University",`
`202`	`205`	`"name": "Poline, Jean-Baptiste",`
`@@ -249,6 +252,9 @@`
`249`	`252`	`"name": "Gonzalez, Ivan",`
`250`	`253`	`"orcid": "0000-0002-6451-6909"`
`251`	`254`	`},`
	`255`	`+ {`
	`256`	`+ "name": "Palasubramaniam, Jath"`
	`257`	`+ },`
`252`	`258`	`{`
`253`	`259`	`"name": "Lecher, Justin"`
`254`	`260`	`},`