update .mailmap, contributors

zlfzhw · Apr 3, 2018 · c9dc622 · c9dc622
1 parent 5d9e820
commit c9dc622
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,9 @@
-Noam Yorav-Raphael <noamraph@gmail.com> <noamraph@gmail.com>
-Casper da Costa-Luis <tqdm@caspersci.uk.to> casperdcl <casper.dcl@physics.org>
-Casper da Costa-Luis <tqdm@caspersci.uk.to> casperdcl <CoD11@imperial.ac.uk>
+Casper da Costa-Luis <tqdm@caspersci.uk.to> casperdcl
+Stephen Larroque <lrq3000@gmail.com>
+Guangshuo Chen <guangshuo.chen@inria.fr> Guangshuo CHEN
+Noam Yorav-Raphael <noamraph@gmail.com>
+James Lu <CrazyPython@users.noreply.github.com>
+Julien Chaumont <git@julienc.io>
+Riccardo Coccioli <volans-@users.noreply.github.com>
+Albert Kottke <albert.kottke@gmail.com>
+Pablo Zivic <elsonidoq@gmail.com>
diff --git a/README.rst b/README.rst
@@ -798,8 +798,9 @@ The main developers, ranked by surviving lines of code, are:
 
 - Casper da Costa-Luis (`casperdcl <https://github.com/casperdcl>`__, ~2/3, |Gift-Casper|)
 - Stephen Larroque (`lrq3000 <https://github.com/lrq3000>`__, ~1/3)
-- Noam Yorav-Raphael (`noamraph <https://github.com/noamraph>`__, ~1%, original author)
+- Guangshuo Chen (`chengs <https://github.com/chengs>`__, ~1%)
 - Hadrien Mary (`hadim <https://github.com/hadim>`__, ~1%)
+- Noam Yorav-Raphael (`noamraph <https://github.com/noamraph>`__, ~1%, original author)
 - Mikhail Korobov (`kmike <https://github.com/kmike>`__, ~1%)
 
 There are also many |GitHub-Contributions| which we are grateful for.