MNT: Update .mailmap, .zenodo.json

nipy · Feb 22, 2019 · effcb37 · effcb37
1 parent fba0cd7
commit effcb37
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.mailmap b/.mailmap
@@ -16,6 +16,7 @@ Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
 Anisha Keshavan <[email protected]> akeshavan <[email protected]>
 Ariel Rokem <[email protected]> arokem <[email protected]>
 Ariel Rokem <[email protected]> arokem <[email protected]>
+Ariel Rokem <[email protected]> Ariel Rokem <[email protected]>
 Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
 Ashely Gillman <[email protected]> Ashley Gillman <[email protected]>
 Ashely Gillman <[email protected]> ashgillman <[email protected]>
@@ -73,6 +74,7 @@ Gael Varoquaux <[email protected]> GaelVaroquaux
 Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 Gavin Cooper <[email protected]> gjcooper <[email protected]>
 Gilles de Hollander <[email protected]> Gilles86 <[email protected]>
+Gio Piantoni <[email protected]> Gio at UMCU <[email protected]>
 Hans Johnson <[email protected]> Hans Johnson <[email protected]>
 Hans Johnson <[email protected]> hjmjohnson <[email protected]>
 Horea Christian <[email protected]> Horea Christian <[email protected]>
@@ -91,6 +93,9 @@ Jessica Forbes <[email protected]> jessicaforbes <[email protected]
 Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
 Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
 Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
+Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
+John Lee <[email protected]> leej3 <[email protected]>
+John Lee <[email protected]> john anthony lee <[email protected]>
 Joke Durnez <[email protected]> jokedurnez <[email protected]>
 Josh Warner <[email protected]> JDWarner <[email protected]>
 Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>

diff --git a/.zenodo.json b/.zenodo.json
@@ -141,16 +141,16 @@
     {
       "name": "Berleant, Shoshana"
     },
-    {
-      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
-      "name": "Horea, Christian",
-      "orcid": "0000-0001-7037-2449"
-    },
     {
       "affiliation": "Dartmouth College: Hanover, NH, United States",
       "name": "Halchenko, Yaroslav O.",
       "orcid": "0000-0003-3456-2493"
     },
+    {
+      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
+      "name": "Christian, Horea",
+      "orcid": "0000-0001-7037-2449"
+    },
     {
       "affiliation": "UC San Diego",
       "name": "Cipollini, Ben",
@@ -186,7 +186,7 @@
     },
     {
       "affiliation": "Athena EPI, Inria Sophia-Antipolis",
-      "name": "Wassermann , Demian",
+      "name": "Wassermann, Demian",
       "orcid": "0000-0001-5194-6056"
     },
     {
@@ -196,7 +196,7 @@
     },
     {
       "affiliation": "Vrije Universiteit, Amsterdam",
-      "name": "Gilles de Hollander",
+      "name": "de Hollander, Gilles",
       "orcid": "0000-0003-1988-5091"
     },
     {
@@ -358,6 +358,11 @@
       "affiliation": "The University of Sydney",
       "name": "Liu, Siqi"
     },
+    {
+      "affiliation": "Leibniz Institute for Neurobiology",
+      "name": "Stadler, J\u00f6rg",
+      "orcid": "0000-0003-4313-129X"
+    },
     {
       "affiliation": "University of Pennsylvania",
       "name": "Kahn, Ari E.",
@@ -377,11 +382,6 @@
       "affiliation": "MPI CBS Leipzig, Germany",
       "name": "Lampe, Leonie"
     },
-    {
-      "affiliation": "Leibniz Institute for Neurobiology",
-      "name": "Stadler, J\u00f6rg",
-      "orcid": "0000-0003-4313-129X"
-    },
     {
       "affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China; Max Planck Institute for Psycholinguistics, Nijmegen, the Netherlands",
       "name": "Kong, Xiang-Zhen",
@@ -604,11 +604,6 @@
       "affiliation": "MIT, HMS",
       "name": "Ghosh, Satrajit",
       "orcid": "0000-0002-5312-6729"
-    },
-    {
-      "affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
-      "name": "Guillon, Jeremy",
-      "orcid": "0000-0002-2672-7510"
     }
   ],
   "keywords": [