aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-05-31 20:06:29 +0200
committerNils Adermann <naderman@naderman.de>2012-05-31 20:06:29 +0200
commit791c4136f74877d67e053bef7153209550d3e5ae (patch)
tree098d723cec58fdeb54113341a60312aba19d5447 /phpBB/docs
parentf616c4e7a0ac6eaeb513b3a2eb2f32a7305525a4 (diff)
parentd22e7ce9df7d54591430fb542f2c2e14535c18cc (diff)
downloadforums-791c4136f74877d67e053bef7153209550d3e5ae.tar
forums-791c4136f74877d67e053bef7153209550d3e5ae.tar.gz
forums-791c4136f74877d67e053bef7153209550d3e5ae.tar.bz2
forums-791c4136f74877d67e053bef7153209550d3e5ae.tar.xz
forums-791c4136f74877d67e053bef7153209550d3e5ae.zip
Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympus
By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10788: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 57adec6a67..446b204a08 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -23,6 +23,7 @@ involved in phpBB.
phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
+ Arty (Vjacheslav Trushkin)
bantu (Andreas Fischer)
imkingdavid (David King)
igorw (Igor Wiedler)