X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/a5c46d31e481f19ab34719e125e3d3d3c0f5a6ea..27c6ddbd569ede8f8a4c981a5a63b17f5c3ec8a4:/CREDITS

diff --git a/CREDITS b/CREDITS
index 5e72d146..97c334db 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,33 +1,43 @@
 Charybdis started as an evolution from ircd-ratbox. Its development
 is led by a team of dedicated developers who have put a lot of time
-into the project, and it has seen use on a variety of different
+into the project and it has seen use on a variety of different
 network configurations.
- 
-The charybdis core team is listed in nick-alphabetical order:
- 
+
+The Charybdis core team, listed in nick-alphabetical order:
+
+amdj, Aaron Jones <aaronmdjones -at- gmail.com>
+Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
 jilles, Jilles Tjoelker <jilles -at- stack.nl>
-mr_flea, Keith Buck <mr_flea -at- esper.net>
 kaniini, William Pitcock <nenolod -at- dereferenced.org>
-spb, Stephen Bennett <spb -at- attenuate.org>
- 
+mr_flea, Keith Buck <mr_flea -at- esper.net>
+Simon, Simon Arlott <charybdis -at- uuid.uk>
+
+The following people are also project members, listed in nick-alphabetical
+order:
+
+jdhore, JD Horelick <jdhore1 -at- gmail.com>
+viatsko, Valerii Iatsko <dwr -at- codingbox.io>
+
 The following people have made contributions to the Charybdis releases,
 in nick-alphabetical order:
- 
+
 AndroSyn, Aaron Sethman <androsyn -at- ratbox.org>
 anfl, Lee Hardy <lee -at- leeh.co.uk>
 beu, Elfyn McBratney <elfyn.mcbratney -at- gmail.com>
-Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
-Entrope, Michael Poole <mdpoole -at- trolius.org> 
+BlindSight, Matt Ullman <matt -at- airraidsirens.com>
+Entrope, Michael Poole <mdpoole -at- trolius.org>
+grawity, Mantas Mikulėnas <grawity -at- gmail.com>
 gxti, Michael Tharp <gxti -at- partiallystapled.com>
-jdhore, JD Horelick <jdhore1 -at- gmail.com>
+mniip <mniip -at- mniip.com>
+spb, Stephen Bennett <spb -at- attenuate.org>
 Taros, Brett Greenham <taros -at- shadowircd.net>
 ThaPrince, Jon Christopherson <jon -at- vile.com>
 twincest, River Tarnell <river -at- attenuate.org>
-viatsko, Valerii Iatsko <dwr -at- codingbox.io>
 w00t, Robin Burchell <surreal.w00t -at- gmail.com>
 
-For a list of contributors to ircd-ratbox, ircd-hyrbid, and ircd2.8 (the
-predecessors to Charybdis), see the doc/credits-past.txt file.
+For a list of contributors to ircd-ratbox, ircd-hybrid, and ircd2.8 (the
+predecessors to Charybdis), see the doc/credits-past.txt file in the Charybdis
+distribution.
 
-Visit the Charybdis website at: http://www.charybdis.io
-Visit us on IRC at: irc.freenode.net #charybdis
+Visit the Charybdis website at: http://www.charybdis.io/
+Visit us on IRC at: irc.charybdis.io #charybdis