aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-10-04 17:25:00 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-10-04 17:25:00 +0200
commit798e62b7b0f66aa5161c77571d7f53676c675a5c (patch)
treef5ad768d692c2a9761d39e8de5726d9ae88b5cca /phpBB/docs
parentcdadda35540d4909a00de01c1671251684e2801f (diff)
parent8e7f2e179e14b42b5c17aba5fc87311294e61511 (diff)
downloadforums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.gz
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.bz2
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.xz
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS [ticket/9829] Fix error in recaptcha validation.
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index d6af9d1db9..b3166313c3 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -27,7 +27,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody)
APTX (Marek A. R.)
bantu (Andreas Fischer)
dhn (Dominik Dröscher)
- evil<3 (Igor Wiedler)
+ igorw (Igor Wiedler)
kellanved (Henry Sudhof)
nickvergessen (Joas Schilling)
rxu (Ruslan Uzdenov)