Merge pull request #3156 from nipy/rel/1.4.1

REL: 1.4.1
nipy · Jan 27, 2020 · 792988f · 792988f
2 parents 3468d9f + 70cafbc
commit 792988f
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 95 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,4 @@
+Abel A. González Orozco <[email protected]>
 Aimi Watanabe <[email protected]>
 Aimi Watanabe <[email protected]> stymy <[email protected]>
 Alejandro Tabas <[email protected]>
@@ -24,6 +25,7 @@ Basille Pinsard <[email protected]> <[email protected]>
 Ben Cipollini <[email protected]> <[email protected]>
 Benjamin Acland <[email protected]>
 Benjamin Meyers <[email protected]>
+Benjamin Meyers <[email protected]> BenjaminMey <w8mZTSngt5W1tl09Fn7k>
 Benjamin Yvernault <[email protected]>
 Benjamin Yvernault <[email protected]> <[email protected]>
 Blake Dewey <[email protected]> <[email protected]>
@@ -96,7 +98,8 @@ Kesshi Jordan <[email protected]> <[email protected]
 Kesshi Jordan <[email protected]> <[email protected]>
 Kevin Sitek <[email protected]>
 Kevin Sitek <[email protected]> <[email protected]>
-Kim, Sin <[email protected]>
+Sin Kim <[email protected]>
+Sin Kim <[email protected]> <[email protected]>
 Kornelius Podranski <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]> <[email protected]>