aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-06-23 18:22:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-06-23 18:22:44 +0000
commitad739a358ca7b593fc5f2bfc77e2058b4ea59163 (patch)
tree0190f40f45cf190dfc5a2a1e0053fa899c14ddce /phpBB/docs
parent3892e7330adb2464293428e58f882f7d18fc8558 (diff)
downloadforums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar
forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.gz
forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.bz2
forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.xz
forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.zip
merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/AUTHORS6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 19bbda832a..49281e2297 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -22,13 +22,15 @@ involved in phpBB.
phpBB Lead Developer : Acyd Burn (Meik Sievertsen)
-phpBB Developers : DavidMJ (David M.)
+phpBB Developers : APTX (Marek A. R.)
+ DavidMJ (David M.)
dhn (Dominik Dröscher)
kellanved (Henry Sudhof)
naderman (Nils Adermann)
- subBlue (Tom Beddard)
+ ToonArmy (Chris Smith)
Vic D'Elfant (Vic D'Elfant)
+
-- Previous Contributors --
phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007]