Skip to content

Commit

Permalink
Merge pull request #10958 from brettp/1.12
Browse files Browse the repository at this point in the history
chore(docs): Updated copyright and license.
  • Loading branch information
brettp committed Jun 14, 2017
2 parents 40e1b89 + 9886da2 commit 04b9c8d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
9 changes: 8 additions & 1 deletion COPYRIGHT.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
The follow individuals, companies, or entities have contributed significant
code to the Elgg project and share the copyright. (In alphabetical order.)

Jerôme Bakker (jeabakker@elgg.org)
Matt Beckett (matt@elgg.org)
Steve Clay (steve@mrclay.org)
Cash Costello (cash.costello@gmail.com)
Jeroen Dalsem (jdalsem@elgg.org)
Juho Jaakkola (juho@elgg.org)
Per Jensen
Ismayil Khayredinov (ismayil@elgg.org)
Brett Profitt (brett.profitt@gmail.com)
Paweł Sroka (pawel@elgg.org)
Dave Tosh (davidgtosh@gmail.com)
Ben Werdmuller (ben@benwerd.com)
Evan Winslow (evan.b.winslow@gmail.com)

Organizations:
The MITRE Corportation (jricher@mitre.org)
The MITRE Corportation (bprofitt@mitre.org)
Curverider Ltd (info@elgg.com)

When adding to this list, update the list of copyright owners in LICENSE.txt.
12 changes: 10 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,22 @@ More info: http://learn.elgg.org/en/latest/intro/license.html
The MIT License (MIT)
Copyright (c) 2017 The following parties:

Jerôme Bakker (jeabakker@elgg.org)
Matt Beckett (matt@elgg.org)
Steve Clay (steve@mrclay.org)
Cash Costello (cash.costello@gmail.com)
Jeroen Dalsem (jdalsem@elgg.org)
Juho Jaakkola (juho@elgg.org)
Per Jensen
Ismayil Khayredinov (ismayil@elgg.org)
Brett Profitt (brett.profitt@gmail.com)
Paweł Sroka (pawel@elgg.org)
Dave Tosh (davidgtosh@gmail.com)
Ben Werdmuller (ben@benwerd.com)
Evan Winslow (evan.b.winslow@gmail.com)

The MITRE Corportation (jricher@mitre.org)
Organizations:
The MITRE Corportation (bprofitt@mitre.org)
Curverider Ltd (info@elgg.com)

Permission is hereby granted, free of charge, to any person obtaining a
Expand Down Expand Up @@ -322,4 +330,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS

0 comments on commit 04b9c8d

Please sign in to comment.