aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-11-11 19:41:10 -0500
committerSteve Clay <steve@mrclay.org>2012-11-11 19:41:10 -0500
commit6623571b615fc5c9d1b82e2607de4cdaee8a818b (patch)
tree38263e895d15de13d677e415b7bc503acfac4135 /CONTRIBUTORS.txt
parenta73df942c5e863996358cb28f31eddaea7f0bdb8 (diff)
parent4049edd160ff2603ccc521ba8d7f5db3561b35e7 (diff)
downloadelgg-6623571b615fc5c9d1b82e2607de4cdaee8a818b.tar.gz
elgg-6623571b615fc5c9d1b82e2607de4cdaee8a818b.tar.bz2
Merge branch '189prep' into 1.8
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0163757e7..a8e74d3a4 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,6 +1,7 @@
The following have made notable contributions to the Elgg Project.
(List in alphabetical order.)
+Steve Clay - http://www.mrclay.org/, https://twitter.com/mrclay_org
Cash Costello - cash@elgg.org, http://cashcostello.com/
@@ -20,10 +21,10 @@ Tom Read - MITRE http://mitre.org/
Justin Richer - MITRE http://mitre.org/
-Dave Tosh - davidgtosh@gmail.com, http://twitter.com/davetosh
+Dave Tosh - davidgtosh@gmail.com, http://twitter.com/davetosh
Ben Werdmuller - http://benwerd.com/
-Nicholas Whitt - nick.whitt@gmail.com, http://twitter.com/nogoodnick
+Nicholas Whitt - nick.whitt@gmail.com, http://twitter.com/nogoodnick
Evan Winslow - evan@elgg.org, http://evanwinslow.com/