diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 15:05:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 15:05:09 +0200 |
| commit | fe4f0ef42c3159945627fdc9b80e22b7a1161063 (patch) | |
| tree | 684e4af234d500114434043612afbb48fbb203a4 | |
| parent | 4b61178d05bf41364393e4751d32398ff24fc221 (diff) | |
| parent | 6abe225f6cb78fe3dd3d05ee17b2508fa98e67ea (diff) | |
| download | forums-fe4f0ef42c3159945627fdc9b80e22b7a1161063.tar forums-fe4f0ef42c3159945627fdc9b80e22b7a1161063.tar.gz forums-fe4f0ef42c3159945627fdc9b80e22b7a1161063.tar.bz2 forums-fe4f0ef42c3159945627fdc9b80e22b7a1161063.tar.xz forums-fe4f0ef42c3159945627fdc9b80e22b7a1161063.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active 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 be82f06c96..512723b0d4 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -24,10 +24,9 @@ phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) EXreaction (Nathan Guse) - igorw (Igor Wiedler) + dhruv.goel92 (Dhruv Goel) imkingdavid (David King) nickvergessen (Joas Schilling) - Oleg (Oleg Pudeyev) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) @@ -53,6 +52,8 @@ 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] + igorw (Igor Wiedler) [08/2010 - 02/2013] + Oleg (Oleg Pudeyev) [01/2011 - 05/2013] rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] ToonArmy (Chris Smith) [06/2008 - 11/2011] |