Skip to content

Commit

Permalink
Updating .mailmap and AUTHORS before release
Browse files Browse the repository at this point in the history
  • Loading branch information
twitwi committed Aug 3, 2017
1 parent b811f98 commit c1fa940
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ Amy Brown <amyrhoda@gmail.com> <arbrown@latte.ca>
Andrew Walker <a.walker@leeds.ac.uk> <andrew.walker@bristol.ac.uk>
Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
Ben Jolly <bhjolly@gmail.com>
Erin Becker <erinstellabecker@gmail.com>
Evan P. Williamson <evanpeterw@gmail.com>
François Michonneau <francois.michonneau@gmail.com>
François Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
James Allen <james@sharelatex.com> <jamesallen0108@gmail.com>
Jonah Duckles <jonah@duckles.org> <jonahd@gmail.com>
Jonathan Cooper <j.p.cooper@ucl.ac.uk> <github.com@jonc.me.uk>
Lauren Michael <lmichael@wisc.edu>
Leighton Pritchard <leightonpritchard@mac.com>
Lex Nederbragt <lex.nederbragt@bio.uio.no> <lex.nederbragt@ibv.uio.no>
Maneesha Sane <ahseenam@gmail.com>
Marianna Foos <mfoos@users.noreply.github.com>
Maxim Belkin <maxim.belkin@gmail.com> <maxim-belkin@users.noreply.github.com>
Mike Jackson <m.jackson@software.ac.uk> <michaelj@epcc.ed.ac.uk>
Neal Davis <davis68@illinois.edu> <davisneale@gmail.com>
Pauline Barmby <pbarmby@uwo.ca>
Expand All @@ -23,5 +26,6 @@ Raniere Silva <raniere@rgaiacs.com> <ra092767@ime.unicamp.br>
Raniere Silva <raniere@rgaiacs.com> <raniere@ime.unicamp.br>
Rémi Emonet <remi@heeere.com> <remi.emonet@reverse--com.heeere>
Rémi Emonet <remi@heeere.com> <twitwi@users.noreply.github.com>
Sarah Stevens <ssteven2@wisc.edu> <sstevens2@wisc.edu>
Timothée Poisot <t.poisot@gmail.com> <tim@poisotlab.io>
Yashasvi Girdhar <yash.girdhar@gmail.com>
18 changes: 5 additions & 13 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,17 @@ Andy Boughton
Erik M. Bray
Amy Brown
C. Titus Brown
Abigail Cabunoc Mayes
Greg Caporaso
Sarah Clayton
Matt Davis
Neal Davis
Gabriel A. Devenyi
Jonah Duckles
Rémi Emonet
Marianna Foos
Yashasvi Girdhar
Ivan Gonzalez
John Gosset
Alistair Grant
Thomas Guignard
Michael Hansen
Konrad Hinsen
Xavier Ho
Damien Irving
Expand All @@ -38,14 +34,10 @@ Kunal Marwaha
Sheldon McKay
Lauren Michael
François Michonneau
Bill Mills
Lex Nederbragt
Aleksandra Nenadic
Aaron O'Leary
Jeramia Ory
Fernando Perez
Jon Pipitone
Timothée Poisot
Leighton Pritchard
Andrey Prokopenko
Scott Ritchie
Expand All @@ -58,18 +50,18 @@ Julia Stewart Lowndes
Tracy Teal
Stefan Topfstedt
Olav Vahtras
Roman Valls Guimera
Philipp Von Bieberstein
Andrew Walker
Ben Waugh
Lukas Weber
Ethan White
Tyson Whitehead
Jason Williams
Evan P. Williamson
Carol Willing
Greg Wilson
Tom Wright
Nick Young
Lee Zamparo
Andrea Zonca
Alex Thompson
Jonathan Cooper
Marcel Stimberg
Mark A. Matienzo
Steve Moss

0 comments on commit c1fa940

Please sign in to comment.