makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14788] Update CREDITS.txt
This commit is contained in:
Tristan Darricau 2016-09-18 13:28:42 +02:00
commit b12ab19ecd
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/docs/CREDITS.txt
View file

@ -1,6 +1,6 @@
/** /**
* *
* phpBB © Copyright phpBB Limited 2003-2014 * phpBB © Copyright phpBB Limited 2003-2016
* http://www.phpbb.com * http://www.phpbb.com
* *
* phpBB is free software. You can redistribute it and/or modify it * phpBB is free software. You can redistribute it and/or modify it
@ -20,13 +20,13 @@
phpBB Project Manager: Marshalrusty (Yuriy Rusko) 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) phpBB Developers: bantu (Andreas Fischer)
CHItA (Máté Bartus) CHItA (Máté Bartus)
dhruv.goel92 (Dhruv Goel)
Elsensee (Oliver Schramm) Elsensee (Oliver Schramm)
marc1706 (Marc Alexander)
nickvergessen (Joas Schilling) nickvergessen (Joas Schilling)
Nicofuma (Tristan Darricau) Nicofuma (Tristan Darricau)
prototech (Cesar Gallegos) 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] ckwalsh (Cullen Walsh) [01/2010 - 07/2011]
DavidMJ (David M.) [12/2005 - 08/2009] DavidMJ (David M.) [12/2005 - 08/2009]
dhn (Dominik Dröscher) [05/2007 - 01/2011] dhn (Dominik Dröscher) [05/2007 - 01/2011]
dhruv.goel92 (Dhruv Goel) [04/2013 - 05/2016]
EXreaction (Nathan Guse) [07/2012 - 05/2014] EXreaction (Nathan Guse) [07/2012 - 05/2014]
GrahamJE (Graham Eames) [09/2005 - 11/2006] GrahamJE (Graham Eames) [09/2005 - 11/2006]
igorw (Igor Wiedler) [08/2010 - 02/2013] igorw (Igor Wiedler) [08/2010 - 02/2013]