Merge branch 'main' into parallel_writing

bruAristimunha · web-flow · commit 5f48fdb138a5 · 2025-10-13T23:15:35.000+02:00
diff --git a/.mailmap b/.mailmap
@@ -4,8 +4,8 @@ Alex Rockhill <aprockhill206@gmail.com> <aprock@uw.edu>
 Alex Rockhill <aprockhill206@gmail.com> <aprockhill@mailbox.org>
 Alexandre Gramfort <alexandre.gramfort@m4x.org>
 Alexandre Gramfort <alexandre.gramfort@m4x.org> <agramfort@fb.com>
-Bruno Aristimunha <b.aristimunha@gmail.com>
 Ariel Rokem <arokem@gmail.com>
+Bruno Aristimunha <b.aristimunha@gmail.com>
 Chris Holdgraf <choldgraf@gmail.com>
 Chris Holdgraf <choldgraf@gmail.com> <choldgraf@berkeley.edu>
 Clemens Brunner <clemens.brunner@gmail.com>

-Original file line number
+Diff line change
 Alex Rockhill <[email protected]> <[email protected]>
 Alexandre Gramfort <[email protected]>
 Alexandre Gramfort <[email protected]> <[email protected]>
 -Bruno Aristimunha <[email protected]>
 Ariel Rokem <[email protected]>
 +Bruno Aristimunha <[email protected]>
 Chris Holdgraf <[email protected]>
 Chris Holdgraf <[email protected]> <[email protected]>
 Clemens Brunner <[email protected]>