aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-09-29 00:26:43 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-09-29 00:26:43 +0200
commit0daab4e0ef772deec55699a967b5127cb9614d7e (patch)
treece4d4ca6b72a752071453eefc26639a82250be54 /phpBB
parent9a92c45ad365629fac658ba566d16097a6eac644 (diff)
parent27bef015d6a5b69f28d17f1f370de45d678cb226 (diff)
downloadforums-0daab4e0ef772deec55699a967b5127cb9614d7e.tar
forums-0daab4e0ef772deec55699a967b5127cb9614d7e.tar.gz
forums-0daab4e0ef772deec55699a967b5127cb9614d7e.tar.bz2
forums-0daab4e0ef772deec55699a967b5127cb9614d7e.tar.xz
forums-0daab4e0ef772deec55699a967b5127cb9614d7e.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/AUTHORS15
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 85653f04e2..c63bd743a7 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -22,15 +22,12 @@ involved in phpBB.
phpBB Lead Developer: naderman (Nils Adermann)
-phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
- Arty (Vjacheslav Trushkin)
- bantu (Andreas Fischer)
- imkingdavid (David King)
+phpBB Developers: bantu (Andreas Fischer)
igorw (Igor Wiedler)
+ imkingdavid (David King)
nickvergessen (Joas Schilling)
Oleg (Oleg Pudeyev)
rxu (Ruslan Uzdenov)
- ToonArmy (Chris Smith)
Contributions by: leviatan21 (Gabriel Vazquez)
Raimon (Raimon Meuldijk)
@@ -39,13 +36,16 @@ Contributions by: leviatan21 (Gabriel Vazquez)
-- Former Contributors --
-phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
+phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
SHS` (Jonathan Stanley)
-phpBB Lead Developer: psoTFX (Paul S. Owen) [2001 - 09/2005]
+phpBB Lead Developer: Acyd Burn (Meik Sievertsen) [09/2005 - 01/2010]
+ psoTFX (Paul S. Owen) [2001 - 09/2005]
phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
+ Acyd Burn (Meik Sievertsen) [02/2003 - 09/2005]
APTX (Marek A. RuszczyƄski) [12/2007 - 04/2011]
+ Arty (Vjacheslav Trushkin) [02/2012 - 07/2012]
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]
@@ -54,6 +54,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
GrahamJE (Graham Eames) [09/2005 - 11/2006]
kellanved (Henry Sudhof) [04/2007 - 03/2011]
TerraFrost (Jim Wigginton) [04/2009 - 01/2011]
+ ToonArmy (Chris Smith) [06/2008 - 11/2011]
Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
-- Copyrights --