aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-03 13:53:21 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-03 13:53:21 +0100
commita5ccb8a860924f48570242e468267885137e3e9a (patch)
treebf22e9f39d9ccaa98ba9f214cfa01d7c3408d46a /AUTHORS
parent1ea4d9ab7bde60b904192718247d49aa1337a18e (diff)
parent1728207c6bb7f3955535ba4a2c1c6fde8e624ed8 (diff)
downloadprosody-a5ccb8a860924f48570242e468267885137e3e9a.tar.gz
prosody-a5ccb8a860924f48570242e468267885137e3e9a.zip
Merge 0.9->trunk
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS12
1 files changed, 9 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 0875361d..3ead470b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,10 @@
-== Core development team ==
-Matthew Wild (matthew.wild AT heavy-horse.co.uk)
-Waqas Hussain (waqas20 AT gmail.com)
+The Prosody project is open to contributions (see HACKERS file), but is
+maintained daily by:
+
+ - Matthew Wild (mail: matthew [at] prosody.im)
+ - Waqas Hussain (mail: waqas [at] prosody.im)
+ - Kim Alvefur (mail: zash [at] prosody.im)
+
+You can reach us collectively by email: developers [at] prosody.im
+or in realtime in the Prosody chatroom: prosody@conference.prosody.im