From abf2d9fe03dfc602ceb62dc2fd8e8e4576926002 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 14 Aug 2020 10:41:55 -0500 Subject: [PATCH] Updated authorship for 3.7.10 --- .authors.yml | 6 +++--- .mailmap | 4 ++-- AUTHORS.rst | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.authors.yml b/.authors.yml index c226b33e3..98c4e9e55 100644 --- a/.authors.yml +++ b/.authors.yml @@ -246,7 +246,7 @@ email: isuru.11@cse.mrt.ac.lk alternate_emails: - isuruf@gmail.com - num_commits: 336 + num_commits: 338 first_commit: 2017-01-08 22:03:03 github: isuruf - name: Julian Rüth @@ -450,7 +450,7 @@ first_commit: 2020-07-01 10:33:54 - name: Tom Pollard email: tom.pollard@codethink.co.uk - num_commits: 4 + num_commits: 5 first_commit: 2020-07-09 05:47:39 - name: Ryan Volz email: rvolz@mit.edu @@ -459,6 +459,6 @@ github: ryanvolz - name: Joshua L. Adelman email: joshua.adelman@gmail.com - num_commits: 1 + num_commits: 6 first_commit: 2020-08-10 20:50:53 github: synapticarbors diff --git a/.mailmap b/.mailmap index 456a33d5a..cc75e8e17 100644 --- a/.mailmap +++ b/.mailmap @@ -47,10 +47,12 @@ Tim Snyder Carlo Carlo Marcel Bargull Marcel Bargull Matthew Craig Matt Craig +Joshua L. Adelman Marius van Niekerk mariusvniekerk Marius van Niekerk Marius Van Niekerk Peter Williams Johannes Köster +Tom Pollard Ryan Volz Matt McCormick John Blischak @@ -58,7 +60,6 @@ Jan Janßen Jan Janßen xoviat Elmar Pruesse Patrick Sodré -Tom Pollard Josh Barnes Tobias Megies Jonathan Helmus @@ -99,4 +100,3 @@ Tim Werner Dave Hirschfeld Nils Wentzell Stuart Berg -Joshua L. Adelman diff --git a/AUTHORS.rst b/AUTHORS.rst index 2c24112cf..c1d909f12 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -36,9 +36,11 @@ Authors are sorted by number of commits. * Carlo * Marcel Bargull * Matthew Craig +* Joshua L. Adelman * Marius van Niekerk * Peter Williams * Johannes Köster +* Tom Pollard * Ryan Volz * Matt McCormick * John Blischak @@ -46,7 +48,6 @@ Authors are sorted by number of commits. * xoviat * Elmar Pruesse * Patrick Sodré -* Tom Pollard * Josh Barnes * Tobias Megies * Jonathan Helmus @@ -87,4 +88,3 @@ Authors are sorted by number of commits. * Dave Hirschfeld * Nils Wentzell * Stuart Berg -* Joshua L. Adelman