diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-09-14 16:58:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-09-14 16:58:35 +0200 |
| commit | 85e32046e3d791eb015cfd8a07f16eb910475fd6 (patch) | |
| tree | bf7e440d846748c8c782df8f3dfc4343a714fc74 /phpBB/docs | |
| parent | 3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582 (diff) | |
| parent | 20460dc12c04a8d946acd54816c220595aa83214 (diff) | |
| download | forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.gz forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.bz2 forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.xz forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9820] phpBB Debug Error when trying to post a new topic.
[ticket/9162] BBCode in poll options is broken, when posting without question.
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
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 84677c4e15..d6af9d1db9 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -26,8 +26,8 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010] APTX (Marek A. R.) bantu (Andreas Fischer) - DavidMJ (David M.) dhn (Dominik Dröscher) + evil<3 (Igor Wiedler) kellanved (Henry Sudhof) nickvergessen (Joas Schilling) rxu (Ruslan Uzdenov) @@ -49,6 +49,7 @@ phpBB Lead Developer: psoTFX (Paul S. Owen) [2001 - 09/2005] phpBB Developers: 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] GrahamJE (Graham Eames) [09/2005 - 11/2006] Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009] |