diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2012-04-12 14:37:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-12 14:37:55 +0200 |
| commit | 3ece096a1e83dc270da84559d76b164425c8c9df (patch) | |
| tree | 608f83736fcc78bee3d766ffc138f05a0106c43c /phpBB/docs/AUTHORS | |
| parent | Merge remote-tracking branch 'callumacrae/ticket/10785' into develop (diff) | |
| parent | Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympus (diff) | |
| download | phpbb-3ece096a1e83dc270da84559d76b164425c8c9df.tar.gz phpbb-3ece096a1e83dc270da84559d76b164425c8c9df.tar.bz2 phpbb-3ece096a1e83dc270da84559d76b164425c8c9df.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
Diffstat (limited to 'phpBB/docs/AUTHORS')
| -rw-r--r-- | phpBB/docs/AUTHORS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 8be261706e..e945af8efa 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] |