diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-11 03:03:18 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-11 03:03:18 +0200 |
| commit | 9a44b5a26947ad03b4fd544687c23290a970379b (patch) | |
| tree | 0532244dadc95fa2a0add85afa7cc5b420a0a612 /phpBB/docs | |
| parent | 7f7a94e5dcddc6e3d3a75cf2cc27376e0a600fba (diff) | |
| parent | a33b0f015a38cc2f54938fd60ff6a5691c2e9e28 (diff) | |
| download | forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.gz forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.bz2 forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.xz forums-9a44b5a26947ad03b4fd544687c23290a970379b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10075] Rename nn- to Oleg in docs/AUTHORS.
[ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/AUTHORS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 83feca009b..81bc9f52e6 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,13 +23,12 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010] - APTX (Marek A. R.) bantu (Andreas Fischer) ckwalsh (Cullen Walsh) igorw (Igor Wiedler) kellanved (Henry Sudhof) nickvergessen (Joas Schilling) - nn- (Oleg Pudeyev) + Oleg (Oleg Pudeyev) rxu (Ruslan Uzdenov) ToonArmy (Chris Smith) @@ -46,6 +45,7 @@ phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007] phpBB Lead Developer: psoTFX (Paul S. Owen) [2001 - 09/2005] 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] DavidMJ (David M.) [12/2005 - 08/2009] |