diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:37:32 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:37:32 +0100 |
| commit | f29bebc7ce367dda4851c83d78e2a61428f63c9d (patch) | |
| tree | 22727e3251c922a1a775c301739eb479e19bb680 /phpBB | |
| parent | d5d412e8271eeee2c416317a9179d5c2005c9383 (diff) | |
| parent | c69b1c2ef24faa74a6b44ccdc19495419bc15131 (diff) | |
| download | forums-f29bebc7ce367dda4851c83d78e2a61428f63c9d.tar forums-f29bebc7ce367dda4851c83d78e2a61428f63c9d.tar.gz forums-f29bebc7ce367dda4851c83d78e2a61428f63c9d.tar.bz2 forums-f29bebc7ce367dda4851c83d78e2a61428f63c9d.tar.xz forums-f29bebc7ce367dda4851c83d78e2a61428f63c9d.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympus
* github-bantu/ticket/11122:
[ticket/11122] Move rxu to 'Former Contributors' section.
[ticket/11122] Add EXreaction to docs/AUTHORS.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/AUTHORS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index c623bbb988..fcef26daa1 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,11 +23,11 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) + EXreaction (Nathan Guse) igorw (Igor Wiedler) imkingdavid (David King) nickvergessen (Joas Schilling) Oleg (Oleg Pudeyev) - rxu (Ruslan Uzdenov) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) @@ -53,6 +53,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] dhn (Dominik Dröscher) [05/2007 - 01/2011] GrahamJE (Graham Eames) [09/2005 - 11/2006] kellanved (Henry Sudhof) [04/2007 - 03/2011] + rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] ToonArmy (Chris Smith) [06/2008 - 11/2011] Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009] |