aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMichaelC <m@michaelcullum.com>2017-11-26 21:54:49 +0000
committerMichaelC <m@michaelcullum.com>2017-11-26 21:54:49 +0000
commit6ed40857ed9dc530c92ffc9406b09c6f89321da6 (patch)
treebe8579648c6c374ec559e040f9f734ecfd48c79d /phpBB
parenta2f5468e8e5852cc0c37c2fe19c251b932992625 (diff)
parentd6d77a199bb754091733225413a0b6e749b5aadd (diff)
downloadforums-6ed40857ed9dc530c92ffc9406b09c6f89321da6.tar
forums-6ed40857ed9dc530c92ffc9406b09c6f89321da6.tar.gz
forums-6ed40857ed9dc530c92ffc9406b09c6f89321da6.tar.bz2
forums-6ed40857ed9dc530c92ffc9406b09c6f89321da6.tar.xz
forums-6ed40857ed9dc530c92ffc9406b09c6f89321da6.zip
Merge remote-tracking branch 'CHItA/ticket/15463' into 3.2.x
* CHItA/ticket/15463: [ticket/15463] Add MichaelC and Hanakin to the dev credits
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CREDITS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index b68281d15c..cb42779641 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -28,6 +28,8 @@ phpBB Developers: bantu (Andreas Fischer)
CHItA (Máté Bartus)
Derky (Derk Ruitenbeek)
Elsensee (Oliver Schramm)
+ Hanakin (Michael Miday)
+ MichaelC (Michael Cullum)
Nicofuma (Tristan Darricau)
For a list of phpBB Team members, please see: