diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 13:28:39 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 13:28:39 +0200 |
| commit | 47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2 (patch) | |
| tree | 99cea638307cb723d78e880d8799364468e75126 /phpBB | |
| parent | 631b0f2dba136194380d83586252f3b5456e8656 (diff) | |
| parent | 27e33f39f7553d2f24fdeae004810493f063265d (diff) | |
| download | forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.gz forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.bz2 forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.xz forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14788] Update CREDITS.txt
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 9 |
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] |