aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2016-09-18 13:28:36 +0200
committerTristan Darricau <github@nicofuma.fr>2016-09-18 13:28:36 +0200
commit27e33f39f7553d2f24fdeae004810493f063265d (patch)
tree955f16afa7f442c5ad45a1993c3005275e56cd9a
parentc3578bc3e3837d961fd0ee9e22532a2e6f32ea51 (diff)
parent0d3ca3883ebbcca4402b3328e4d4311d298906e7 (diff)
downloadforums-27e33f39f7553d2f24fdeae004810493f063265d.tar
forums-27e33f39f7553d2f24fdeae004810493f063265d.tar.gz
forums-27e33f39f7553d2f24fdeae004810493f063265d.tar.bz2
forums-27e33f39f7553d2f24fdeae004810493f063265d.tar.xz
forums-27e33f39f7553d2f24fdeae004810493f063265d.zip
Merge pull request #4451 from marc1706/ticket/14788
[ticket/14788] Update CREDITS.txt * marc1706/ticket/14788: [ticket/14788] Update CREDITS.txt
-rw-r--r--phpBB/docs/CREDITS.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index deb36339b0..471e6b3c88 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -1,6 +1,6 @@
/**
*
-* phpBB © Copyright phpBB Limited 2003-2014
+* phpBB © Copyright phpBB Limited 2003-2016
* http://www.phpbb.com
*
* phpBB is free software. You can redistribute it and/or modify it
@@ -20,13 +20,13 @@
phpBB Project Manager: Marshalrusty (Yuriy Rusko)
-phpBB Lead Developer: naderman (Nils Adermann)
+phpBB Product Manager: naderman (Nils Adermann)
+
+phpBB Lead Developer: Marc (Marc Alexander)
phpBB Developers: bantu (Andreas Fischer)
CHItA (Máté Bartus)
- dhruv.goel92 (Dhruv Goel)
Elsensee (Oliver Schramm)
- marc1706 (Marc Alexander)
nickvergessen (Joas Schilling)
Nicofuma (Tristan Darricau)
prototech (Cesar Gallegos)
@@ -54,6 +54,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
ckwalsh (Cullen Walsh) [01/2010 - 07/2011]
DavidMJ (David M.) [12/2005 - 08/2009]
dhn (Dominik Dröscher) [05/2007 - 01/2011]
+ dhruv.goel92 (Dhruv Goel) [04/2013 - 05/2016]
EXreaction (Nathan Guse) [07/2012 - 05/2014]
GrahamJE (Graham Eames) [09/2005 - 11/2006]
igorw (Igor Wiedler) [08/2010 - 02/2013]