diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d14e00273f0d..f0e5eb2e951a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -5,58 +5,113 @@ Code Contributors for 5.x
************************************************
CiviCRM - Coleman Watts, Tim Otten
-
-AGH Strategies - Alice Frumin, Andrew Hunt, Eli Lisseck
-Agileware - Francis Whittle, Justin Freeman, Pengyi Zhang
+a-n The Artists Information Company - William Mortada
+AGH Strategies - Alice Frumin, Andrew Hunt, Eli Lisseck, Tommy Bobo
+Agileware - Alok Patel, Francis Whittle, Justin Freeman, Pengyi Zhang
+Alexy Mikhailichenko
+Andrei Mondoc
Andrew Thompson
-applicado
-Australian Greens - Seamus Lee
+Armadillo Sec Ltd - Daniel Compton
+Australian Greens - Andrew Cormick-Dockery, Seamus Lee
Bastien Ho
Blackfly Solutions - Alan Dixon
-Calibrate - Wannes De Roy
+Business & Code - Alain Benbassat
+Calbasi - Joan Cervan Andreu
+Calibrate - Wannes De Roy, Wouter Hechtermans
Caltha - Tomasz Pietrzkowski
CEDC - Laryn Kragt Bakker
+Centrale Organisatie van Voetbal Scheidsrechters (COVS) - Ed van Leeuwen
Chris Burgess
-CiviCoop - Jaap Jansma
+Christian Wach
+Circle Interactive - Dave Jenkins, Kirk Jackson, Martin Castle, Pradeep Nayak,
+ Reece Benson
+CiviCoop - Jaap Jansma, Klaas Eikelboom
CiviDesk - Sunil Pawar, Sushant Paste, Yashodha Chaku
+CiviFirst - John Kirk
CompuCorp - Camilo Rodriguez, Davi Alexandre, Debarshi Bhaumik, Michael Devery,
Mukesh Ram, Omar Abu Hussein, René Olivo, Vinu Varshith Sekar
-Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove
+Coop SymbioTIC - Guillaume Boudrias, Mathieu Lutfy, Samuel Vanhove
Davis Media Access - Darrick Servis
+Deepak Srivastava
+Derek Lewis
+Digitalcourage - Detlev Sieber
+DignityUSA - Logan Bear
Electronic Frontier Foundation - Mark Burdett
eQuality Technology - Greg Rundlett
+Florian Kohrt
+Francesc Bassas i Bullich
+Frank J. Gómez
Freeform Solutions - Herb van den Dool
-Fuzion - Jitendra Purohit
-Ginkgo Street Labs - Frank Gómez
+Fuzion - Jitendra Purohit, Luke Stewart
Hossein Amin
-JMA Consulting - Joe Murray, Monish Deb
+Giant Rabbit - Peter Haight
+Giovanni Dalmas
+Greenpeace Central and Eastern Europe - Patrick Figel
+Guillaume Rischard
+iXiam - César Ramos, Luciano Spiegel, Vangelis Pantazis
+Jamie Tillman
+Jens Schuppe
+JMA Consulting - Edsel Lopez, Joe Murray, Monish Deb
Johan Vervloet
John Kingsnorth
+John Kyle Cronan
Joinery - Allen Shaw
+Joost Fock
+Just Hope - Phil Morice Brubaker
Kanzu Code - Carl Andrew Lema
+Ken West
+Kilakwa Associates - smaen123
Kompetenzzentrum Technik-Diversity-Chancengleichheit - Niels Heinemann
+Korlon - Stuart Gaston
Left Join Labs - Sean Madsen
+Lemniscus - Noah Miller
Lighthouse Design and Consulting - Brian Shaughnessy
+Liquid Web, Inc. - Jason Gillman Jr.
Łukasz Krutul
+Marcus J Wilson
+Mark Westergaard
Megaphone Technology Consulting - Jon Goldberg
+MillerTech - Chamil Wijesooriya
+MJCO - Mikey O'Toole
MJW Consulting - Matthew Wire
+Mountev Ltd
myDropWizard - David Snopek
Naomi Rosenberg
+Nicol Wistreich
Olivier Tétard
+Onyemenam Ndubuisi
OSSeed Technologies - Madhavi Malgaonkar
Oxfam Germany - Thomas Schüttler, Yuliyana Liyana
-Pradeep Nayak
+Palante Technology Cooperative - Morgan Robinson
+PeaceWorks Technology Solutions - Martin Hansen
+PHD Computer Consultants - Chris Cant
Progressive Technology Project - Jamie McClelland
+Ray Wright
Richard van Oosterhout
Romain Thouvenin
+Samson Alajede
+Selwyn Tang
+Semper IT - Karin Gerritsen
+Skvare - Mark Hanna
Squiffle Consulting - Aidan Saunders
-Systopia - Björn Endres
+Stephen Palmstrom
+Steve Ellis
+Systopia - Björn Endres, Thomas Leichtfuss
Tadpole Collective - Kevin Cristiano
+Tanya Bouman
+Team Expansion - Greg Harris
Third Sector Design - Michael McAndrew
+Thomas Mannell
+Timbsoft Technologies - Tunbola Ogunwande
+Tiotsop Gerest
Tom Bloor
-Wikimedia Foundation - Eileen McNaughton
+Veda Consulting - Mathavan Veeramuthu
+Wikimedia Foundation - Eileen McNaughton, Elliott Eggleston
Wildsight - Lars Sanders-Green
Will Long
+GitHub users 19ATF77, applicado, avall-llovera, JGaunt, marcineq, maynardsmith,
+ mmyriam, skherraz, tapash, yalh
+
************************************************
Key Contributors and Sponsors for 4.7
diff --git a/contributor-key.yml b/contributor-key.yml
index b1719702672c..8343cd99fcda 100644
--- a/contributor-key.yml
+++ b/contributor-key.yml
@@ -1102,7 +1102,7 @@
- github : pfigel
name : Patrick Figel
- organization: Greenpeace CEE
+ organization: Greenpeace Central and Eastern Europe
- github : philmck
name : Phil McKerracher
diff --git a/release-notes/5.10.2.md b/release-notes/5.10.2.md
index 9fad1acef09a..215089004855 100644
--- a/release-notes/5.10.2.md
+++ b/release-notes/5.10.2.md
@@ -47,7 +47,7 @@ Released February 14, 2019
This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; MJW Consulting - Matthew Wire; Fuzion - Jitendra Purohit;
-CiviCRM - Mathieu Luffy and Coleman Watts; Australian Greens - Seamus Lee
+CiviCRM - Mathieu Lutfy and Coleman Watts; Australian Greens - Seamus Lee
## Feedback
diff --git a/release-notes/5.10.4.md b/release-notes/5.10.4.md
index 43179bb5c2e9..9e5fee07e1f6 100644
--- a/release-notes/5.10.4.md
+++ b/release-notes/5.10.4.md
@@ -51,7 +51,7 @@ This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; Fuzion - Jitendra Purohit;
Semper IT - Karin Gerritsen; CiviCRM - Tim Otten;
Australian Greens - Seamus Lee; Blackfly Solutions - Alan Dixon;
-Megaphone Technology Consulting - Jon Goldberg;
+Megaphone Technology Consulting - Jon Goldberg
## Feedback
diff --git a/release-notes/5.11.0.md b/release-notes/5.11.0.md
index 64fe5fb47dbe..7cb977fda5d3 100644
--- a/release-notes/5.11.0.md
+++ b/release-notes/5.11.0.md
@@ -714,7 +714,7 @@ J. Gómez; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe -
Patrick Figel; iXiam - Luciano Spiegel; JMA Consulting - Monish Deb; Joinery -
Allen Shaw; Ken West; Liquid Web, Inc. - Jason Gillman Jr.; Megaphone Technology
Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJW Consulting -
-Matthew Wire; Oxfam Germany - Thomas Schüttler; PeaceWorks Technology Solutions -
+Matthew Wire; Oxfam Germany - Thomas Schüttler; PeaceWorks Technology Solutions -
Martin Hansen; Pradeep Nayak; Progressive Technology Project - Jamie
McClelland; Squiffle Consulting - Aidan Saunders; Wikimedia Foundation - Eileen
McNaughton
@@ -725,7 +725,7 @@ reviewers contributed their comments:
British Humanist Association - Andrew West; CiviDesk - Nicolas Ganivet; Clare
Marsh; CompuCorp - Shitij Gugnani; Fuzion - Peter Davis; JMA Consulting - Joe
Murray; Lighthouse Design and Consulting - Brian Shaughnessy; Richard van
-Oosterhout; QED42 - Swastik Pareek; Tadpole Collective - Kevin Cristiano;
+Oosterhout; QED42 - Swastik Pareek; Tadpole Collective - Kevin Cristiano
## Feedback
diff --git a/release-notes/5.13.1.md b/release-notes/5.13.1.md
index 1dca67e4f11a..3904309732a4 100644
--- a/release-notes/5.13.1.md
+++ b/release-notes/5.13.1.md
@@ -30,7 +30,7 @@ Released May 2, 2019
This release was developed by the following authors and reviewers:
Australian Greens - Seamus Lee; Megaphone Technology Consulting - Jon Goldberg;
-Tadpole Collective - Kevin Cristiano;
+Tadpole Collective - Kevin Cristiano
## Feedback
diff --git a/release-notes/5.13.2.md b/release-notes/5.13.2.md
index 487b77845d09..5583311d35df 100644
--- a/release-notes/5.13.2.md
+++ b/release-notes/5.13.2.md
@@ -32,7 +32,7 @@ Released May 6, 2019
This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; CiviCRM - Tim Otten; Australian Greens - Seamus Lee;
-Dave D;
+Dave D
## Feedback
diff --git a/release-notes/5.13.5.md b/release-notes/5.13.5.md
index b02556c51da5..aaa0eaa44180 100644
--- a/release-notes/5.13.5.md
+++ b/release-notes/5.13.5.md
@@ -46,7 +46,7 @@ This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; Pradeep Nayak; Korlon - Stuart Gaston;
John Kyle Cronan; Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Coleman Watts, Tim Otten;
Caltha - Tomasz Pietrzkowski; Business & Code - Alain Benbassat; Australian Greens - Seamus Lee,
-Andrew Cormick-Dockery; Agileware - Justin Freeman; AGH Strategies - Andrew Hunt, Tommy Bobo.
+Andrew Cormick-Dockery; Agileware - Justin Freeman; AGH Strategies - Andrew Hunt, Tommy Bobo
## Feedback
diff --git a/release-notes/5.14.0.md b/release-notes/5.14.0.md
index 11b3008da741..48d6aa7b74a1 100644
--- a/release-notes/5.14.0.md
+++ b/release-notes/5.14.0.md
@@ -294,7 +294,7 @@ Released June 5, 2019
Fixes a fatal error where checksum users were not able to cancel or update
recurring contributions.
-- **Fix error when exporting soft credits ([dev/core#1015](https://lab.civicrm.org/dev/core/issues/1015): [14453](https://github.com/civicrm/civicrm-core/pull/14453))**
+- **Fix error when exporting soft credits ([dev/core#1015](https://lab.civicrm.org/dev/core/issues/1015): [14453](https://github.com/civicrm/civicrm-core/pull/14453))**
### CiviEvent
@@ -541,7 +541,7 @@ reviewers contributed their comments:
AGH Strategies - Tommy Bobo; DevApp - Adam Kwiatkowski; Fuzion - Jitendra
Purohit; JMA Consulting - Joe Murray; Nicol Wistreich; Palante - Morgan
-Robinson; Skvare - Mark Hanna; Tapash Datta;
+Robinson; Skvare - Mark Hanna; Tapash Datta
## Feedback
diff --git a/release-notes/5.16.1.md b/release-notes/5.16.1.md
index 7b4e396c218d..10316b3c358b 100644
--- a/release-notes/5.16.1.md
+++ b/release-notes/5.16.1.md
@@ -28,7 +28,7 @@ Released August 12, 2019
This release was developed by the following authors and reviewers:
-Megaphone Technology Consulting - Jon Goldberg; CiviCRM - Colemann Watts;
+Megaphone Technology Consulting - Jon Goldberg; CiviCRM - Coleman Watts;
Australian Greens - Seamus Lee
## Feedback
diff --git a/release-notes/5.18.0.md b/release-notes/5.18.0.md
index 35178222dded..a3dd9da80b18 100644
--- a/release-notes/5.18.0.md
+++ b/release-notes/5.18.0.md
@@ -867,7 +867,7 @@ reviewers contributed their comments:
AGH Strategies - Alice Frumin; Agileware - Francis Whittle, Pengyi Zhang;
don-alejandro-z; Fuzion - Jitendra Purohit; iXiam - Luciano Spiegel; JMA
Consulting - Joe Murray; Nicol Wistreich; Semper IT - Karin Gerritsen; Squiffle
-Consulting - Aidan Saunders;
+Consulting - Aidan Saunders
## Feedback
diff --git a/release-notes/5.19.0.md b/release-notes/5.19.0.md
index 631a46da9dd2..5252eaa84edb 100644
--- a/release-notes/5.19.0.md
+++ b/release-notes/5.19.0.md
@@ -29,7 +29,7 @@ Released November 6, 2019
([15309](https://github.com/civicrm/civicrm-core/pull/15309) and
[15331](https://github.com/civicrm/civicrm-core/pull/15331))**
- Migrates API version 4 from a standalone extension (`org.civicrm.api4`)
+ Migrates API version 4 from a standalone extension (`org.civicrm.api4`)
into the core codebase. If the old extension is present, it will be disabled.
For more information, see [Developer Guide: APIv4 Usage](https://docs.civicrm.org/dev/en/latest/api/v4/usage/)
@@ -484,7 +484,7 @@ CompuCorp - Vinu Varshith Sekar; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove;
Dave D; Fuzion - Jitendra Purohit; Greenpeace CEE - Patrick Figel; JMA
Consulting - Monish Deb; John Kingsnorth; Megaphone Technology Consulting - Jon
Goldberg; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Kilakwa
-Associates - smaen123; Wikimedia Foundation - Eileen McNaughton;
+Associates - smaen123; Wikimedia Foundation - Eileen McNaughton
Most authors also reviewed code for this release; in addition, the following
reviewers contributed their comments:
@@ -492,7 +492,7 @@ reviewers contributed their comments:
AGH Strategies - Alice Frumin; Artful Robot - Rich Lott; Circle Interactive -
Dave Jenkins; Community IT Academy - William Mortada; JMA Consulting - Joe
Murray; Korlon - Stuart Gaston; Nicol Wistreich; Tadpole Collective - Kevin
-Cristiano;
+Cristiano
## Feedback
diff --git a/release-notes/5.21.0.md b/release-notes/5.21.0.md
index 1f5371160cff..2a8e8a990677 100644
--- a/release-notes/5.21.0.md
+++ b/release-notes/5.21.0.md
@@ -678,7 +678,7 @@ reviewers contributed their comments:
AGH Strategies - Alice Frumin; Artful Robot - Rich Lott; Chris Burgess; Circle
Interactive - Dave Jenkins; John Kingsnorth; Freeform Solutions - Lola Slade;
-OSSeed Technologies LLP - Revati Gawas;
+OSSeed Technologies LLP - Revati Gawas
## Feedback