summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-08-05 11:35:53 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-08-05 11:35:53 +0200
commit6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch)
tree985faf01c526763515731569fa01a99f4dbef36e /AUTHORS
parente0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff)
parent559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff)
downloadUXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip
Merge branch 'master' into js-modules
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS7
1 files changed, 5 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 7e9d1f491..149ea5cc4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,8 +3,10 @@ codebase which lives in this repository. If you make a contribution
here, you may add your name and, optionally, email address in the
appropriate place.
-For a full list of the people who are credited with making a
-contribution to Mozilla, see http://www.mozilla.org/credits/ .
+For a more comprehensive list of the people who are credited with
+making a contribution to this project and its Mozilla roots, see
+http://www.palemoon.org/Contributors.shtml
+
<1010mozilla@Ostermiller.com>
Aaron Boodman <aa@google.com>
@@ -650,6 +652,7 @@ Mark Mentovai <mark@moxienet.com>
Mark Pilgrim <pilgrim@gmail.com>
Mark Smith <mcs@pearlcrescent.com>
Mark Steele <mwsteele@gmail.com>
+Mark Straver <moonchild@palemoon.org>
Markus G. Kuhn <mkuhn@acm.org>
Markus Stange <mstange@themasta.com>
Martijn Pieters <mj@digicool.com>