diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-12 13:47:42 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-12 13:47:42 +0100 |
| commit | dd561ec2750e17b433bf564a549872157c9b4f05 (patch) | |
| tree | 080e8a06d0d3d30eae68745b289bae6791aec7f8 /phpBB/docs | |
| parent | 8d3d396f1b0feba7be1141dada5c9eee5391b216 (diff) | |
| parent | a298ed1a66c11c6f67d6f55877e0b0dd5747d85d (diff) | |
| download | forums-dd561ec2750e17b433bf564a549872157c9b4f05.tar forums-dd561ec2750e17b433bf564a549872157c9b4f05.tar.gz forums-dd561ec2750e17b433bf564a549872157c9b4f05.tar.bz2 forums-dd561ec2750e17b433bf564a549872157c9b4f05.tar.xz forums-dd561ec2750e17b433bf564a549872157c9b4f05.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 471e6b3c88..26ff8fcc80 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -27,7 +27,6 @@ phpBB Lead Developer: Marc (Marc Alexander) phpBB Developers: bantu (Andreas Fischer) CHItA (Máté Bartus) Elsensee (Oliver Schramm) - nickvergessen (Joas Schilling) Nicofuma (Tristan Darricau) prototech (Cesar Gallegos) @@ -60,6 +59,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] igorw (Igor Wiedler) [08/2010 - 02/2013] imkingdavid (David King) [11/2012 - 06/2014] kellanved (Henry Sudhof) [04/2007 - 03/2011] + nickvergessen (Joas Schilling)[04/2010 - 12/2015] Oleg (Oleg Pudeyev) [01/2011 - 05/2013] rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] |