diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
| commit | a01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch) | |
| tree | 651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/docs | |
| parent | d2295b3d1f191710916b12980e13c97419ecf0ae (diff) | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2 forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/docs')
| -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] |