Merge pull request #3116 from nipy/rel/1.4.0

REL: 1.4.0
nipy · Dec 20, 2019 · 4c3279c · 4c3279c
2 parents 03e30cc + 1a86904
commit 4c3279c
Show file tree

Hide file tree

Showing 5 changed files with 279 additions and 271 deletions.
diff --git a/.mailmap b/.mailmap
@@ -122,13 +122,15 @@ Michael Dayan <[email protected]> <[email protected]>
 Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
 Michael Dayan <[email protected]> <[email protected]>
 Michael Joseph <[email protected]>
+Michael Joseph <[email protected]> <[email protected]>
 Michael Philipp Notter <[email protected]>
 Michael Philipp Notter <[email protected]>
 Michael Waskom <[email protected]> <[email protected]>
 Michael Waskom <[email protected]> <[email protected]>
 Michael Waskom <[email protected]> <[email protected]>
 Miguel Molina-Romero <[email protected]>
 Murat Bilgel <[email protected]> <[email protected]>
+Nat Lee <[email protected]>
 Oliver Contier <[email protected]> <[email protected]>
 Olivia Stanley <[email protected]>
 Oscar Esteban <[email protected]>