diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:37:38 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:37:38 +0100 |
| commit | 0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5 (patch) | |
| tree | b6517c9c795c1c420b2ea4d398db640887decd57 | |
| parent | 54f34dd26f6a166cf1bf9f3c7e483989af29ec71 (diff) | |
| parent | f29bebc7ce367dda4851c83d78e2a61428f63c9d (diff) | |
| download | forums-0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5.tar forums-0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5.tar.gz forums-0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5.tar.bz2 forums-0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5.tar.xz forums-0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11122] Move rxu to 'Former Contributors' section.
[ticket/11122] Add EXreaction to docs/AUTHORS.
| -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 c63bd743a7..be82f06c96 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] |