aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-02-24 18:55:04 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-02-24 18:55:04 +0100
commitaff9414f6834e140f6b3aa109caf634e72d84bd6 (patch)
tree5d3e049535ca5cd88ee5ab22b2f795455bababdf
parent50cf6443b981c6072f5a42c60b8dea3d548345c8 (diff)
parenta9ef8212537a64039e1f1ef6b6f05561fa8712ed (diff)
downloadforums-aff9414f6834e140f6b3aa109caf634e72d84bd6.tar
forums-aff9414f6834e140f6b3aa109caf634e72d84bd6.tar.gz
forums-aff9414f6834e140f6b3aa109caf634e72d84bd6.tar.bz2
forums-aff9414f6834e140f6b3aa109caf634e72d84bd6.tar.xz
forums-aff9414f6834e140f6b3aa109caf634e72d84bd6.zip
Merge pull request #5144 from marc1706/ticket/15466
[ticket/15466] Update CREDITS.txt to reflect Nils leaving [ci skip]
-rw-r--r--phpBB/docs/CREDITS.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index cb42779641..4c8974d7c9 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -20,8 +20,6 @@
phpBB Project Manager: Marshalrusty (Yuriy Rusko)
-phpBB Product Manager: naderman (Nils Adermann)
-
phpBB Lead Developer: Marc (Marc Alexander)
phpBB Developers: bantu (Andreas Fischer)
@@ -43,7 +41,10 @@ https://github.com/phpbb/phpbb/graphs/contributors
phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
SHS` (Jonathan Stanley)
-phpBB Lead Developer: Acyd Burn (Meik Sievertsen) [09/2005 - 01/2010]
+phpBB Product Manager: naderman (Nils Adermann) [02/2016 - 02/2017]
+
+phpBB Lead Developer: naderman (Nils Adermann) [01/2010 - 02/2016]
+ Acyd Burn (Meik Sievertsen) [09/2005 - 01/2010]
psoTFX (Paul S. Owen) [2001 - 09/2005]
phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]