aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-04-12 14:37:47 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-04-12 14:37:47 +0200
commitf1f2ab92b15e57c182dadfd9f3cd606cff13946c (patch)
tree8c562e1359ebdefc247c621d406cf860d6b9c006
parentMerge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympus (diff)
parent[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. (diff)
downloadphpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.tar.gz
phpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.tar.bz2
phpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.zip
Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympus
* bantu/ticket/10788: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
-rw-r--r--phpBB/docs/AUTHORS5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index de599193d2..57adec6a67 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -24,9 +24,8 @@ phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
bantu (Andreas Fischer)
- ckwalsh (Cullen Walsh)
+ imkingdavid (David King)
igorw (Igor Wiedler)
- kellanved (Henry Sudhof)
nickvergessen (Joas Schilling)
Oleg (Oleg Pudeyev)
rxu (Ruslan Uzdenov)
@@ -48,9 +47,11 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
APTX (Marek A. Ruszczyński) [12/2007 - 04/2011]
Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006]
BartVB (Bart van Bragt) [11/2000 - 03/2006]
+ ckwalsh (Cullen Walsh) [01/2010 - 07/2011]
DavidMJ (David M.) [12/2005 - 08/2009]
dhn (Dominik Dröscher) [05/2007 - 01/2011]
GrahamJE (Graham Eames) [09/2005 - 11/2006]
+ kellanved (Henry Sudhof) [04/2007 - 03/2011]
TerraFrost (Jim Wigginton) [04/2009 - 01/2011]
Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]