Skip to content

Commit

Permalink
Merge pull request #11935 from civicrm/5.0
Browse files Browse the repository at this point in the history
5.0 to master
  • Loading branch information
eileenmcnaughton authored Apr 4, 2018
2 parents 33e74ac + 9d3d917 commit c62cbf6
Show file tree
Hide file tree
Showing 4 changed files with 850 additions and 2 deletions.
31 changes: 31 additions & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
The following people and organizations sponsored and/or contributed new and improved features to the project.

************************************************
Key Contributors and Sponsors for 5.x
************************************************

CiviCRM - Coleman Watts, Tim Otten

AGH Strategies - Andrew Hunt
Agileware - Alok Patel
Australian Greens - Seamus Lee
CiviDesk - Yashodha Chaku
CompuCorp - Mukesh Ram, Omar Abu Hussein, Vinu Varshith Sekar
Coop SymbioTIC - Samuel Vanhove
Davis Media Access - Darrick Servis
Fuzion - Jitendra Purohit
Ginkgo Street Labs - Frank Gómez
JMA Consulting - Monish Deb
John Kingsnorth
Joinery - Allen Shaw
Left Join Labs - Sean Madsen
Lighthouse Design and Consulting - Brian Shaughnessy
Łukasz Krutul
MJW Consulting - Matthew Wire
myDropWizard - David Snopek
Oxfam Germany - Thomas Schüttler
Progressive Technology Project - Jamie McClelland
René Olivo
Systopia - Björn Endres
Tadpole Collective - Kevin Cristiano
Third Sector Design - Michael McAndrew
Wikimedia Foundation - Eileen McNaughton

************************************************
Key Contributors and Sponsors for 4.7
************************************************
Expand Down
31 changes: 29 additions & 2 deletions contributor-key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@
organization: British Humanist Association
jira : awestbha

- name : Matthias Bärnthaler
jira : baerm

- github : BorislavZlatanov
name : Borislav Zlatanov
jira : BorislavZlatanov
Expand Down Expand Up @@ -202,6 +205,10 @@
organization: Comunica2
jira : ñull

- github : cor73x
name : Łukasz Krutul
jira : n3o

- github : coolbit
name : Chandana Bandara
organization: CompuCorp
Expand Down Expand Up @@ -272,8 +279,9 @@
name : Arun Singh
jira : aruns6578

- name : Adam Kwiatkowski
organization: DevMate
- github : adam-devapp
name : Adam Kwiatkowski
organization: DevApp
jira : devmate

- github : dlobo
Expand Down Expand Up @@ -682,6 +690,9 @@
name : Kevin Reynen
jira : kreynen

- name : Kristine Chan
jira : KristineC

- github : kryptothesuperdog
name : Andrew West
organization: British Humanist Association
Expand Down Expand Up @@ -751,6 +762,11 @@
name : Richard van Oosterhout
jira : magnolia61

- github : maitrepylos
name : Gérard Ernaelsten
organization: Formatux
jira : maitrepylos

- name : Manish Zope
jira : manish

Expand Down Expand Up @@ -986,6 +1002,9 @@
name : Pradeep Nayak
jira : pradeep.nayak

- name : Paul Treadaway
jira : ptreadaway

- name : Angela Cacciola
organization: Canine Companions for Independence
jira : princessang417
Expand All @@ -1002,6 +1021,9 @@
organization: Play Australia
jira : Renz56c.o

- github : reneolivo
name : René Olivo

- name : Robyn Perry
organization: Progressive Technology Project
jira : reperry
Expand Down Expand Up @@ -1245,8 +1267,13 @@

- github : varshith
name : Vinu Varshith Sekar
organization: CompuCorp
jira : varshith

- github : vinuvarshith
name : Vinu Varshith Sekar
organization: CompuCorp

- github : VasanthaKaje
name : Vasantha Kaje
jira : VasanthaKaje
Expand Down
11 changes: 11 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress

## CiviCRM 5.0.0

Released April 4, 2018

- **[Synopsis](release-notes/5.0.0.md#synopsis)**
- **[Features](release-notes/5.0.0.md#features)**
- **[Bugs resolved](release-notes/5.0.0.md#bugs)**
- **[Miscellany](release-notes/5.0.0.md#misc)**
- **[Credits](release-notes/5.0.0.md#credits)**
- **[Feedback](release-notes/5.0.0.md#feedback)**

## CiviCRM 4.7.31

Released March 7, 2018
Expand Down
Loading

0 comments on commit c62cbf6

Please sign in to comment.