aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-07-02 22:56:03 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-02 22:56:03 +0200
commit1b0aceee484ed48f4ba0839faa355d4f678bb82b (patch)
tree8a4748f79183bcf897ecceea374d9ce174632c71
parent4487b6f4c8a0d962c649bf1b21fbb1d6db359e98 (diff)
parent868179c295b07c5bc9a2eccab9d9dd645a9b0561 (diff)
downloadforums-1b0aceee484ed48f4ba0839faa355d4f678bb82b.tar
forums-1b0aceee484ed48f4ba0839faa355d4f678bb82b.tar.gz
forums-1b0aceee484ed48f4ba0839faa355d4f678bb82b.tar.bz2
forums-1b0aceee484ed48f4ba0839faa355d4f678bb82b.tar.xz
forums-1b0aceee484ed48f4ba0839faa355d4f678bb82b.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12120] Add nicofuma to the developers
-rw-r--r--phpBB/docs/CREDITS.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index a4ba4cb87c..edb6361b2a 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -28,6 +28,7 @@ phpBB Developers: bantu (Andreas Fischer)
imkingdavid (David King)
marc1706 (Marc Alexander)
nickvergessen (Joas Schilling)
+ nicofuma (Tristan Darricau)
prototech (Cesar Gallegos)
For a list of phpBB Team members, please see: