aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 23:42:26 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 23:42:26 +0000
commitdf4226866779f75eacab7f62da36b22dc21d5e44 (patch)
treee6c58d3d77187050fb4b966cc78a69766369c52c /CONTRIBUTORS.txt
parent60c1387a16ea4944674b0c9da2273158d1fbf0b4 (diff)
downloadelgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.gz
elgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.bz2
Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to plugins like groups and wire)
git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a1a932927..163b19d9c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -11,10 +11,14 @@ Pete Harris <pete@elgg.com>
Nicholas Whitt <nick@elgg.com>
http://twitter.com/nogoodnick
+
CONTRIBUTING DEVELOPERS
Cash Costello - http://cashcostello.com/
Justin Richer, Nathan Rackliffe, Tom Read, Jon Maul - MITRE http://www.mitre.org/
+Milan Magudia - http://hedgehogs.net/
+Evan Winslow - http://evanwinslow.com/
+
ALUMNI DEVELOPERS