aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-06 12:06:39 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-06 12:06:39 +0100
commit743d3af3c52f21a47795b76598b0136ad261839a (patch)
tree0adb5b5cd66de35b42aaa18f25153692ac33c8c9
parentaf4f477a1b23775f94c347b668e8d1a095818cd6 (diff)
downloadforums-743d3af3c52f21a47795b76598b0136ad261839a.tar
forums-743d3af3c52f21a47795b76598b0136ad261839a.tar.gz
forums-743d3af3c52f21a47795b76598b0136ad261839a.tar.bz2
forums-743d3af3c52f21a47795b76598b0136ad261839a.tar.xz
forums-743d3af3c52f21a47795b76598b0136ad261839a.zip
[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
PHPBB3-14961
-rw-r--r--phpBB/docs/CREDITS.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index 26ff8fcc80..2df7543ce1 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -75,9 +75,7 @@ Major contributions by: leviatan21 (Gabriel Vazquez)
Visual Confirmation: Xore (Robert Hetzler)
-Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Limited
prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
-subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
phpBB contains code from the following applications:
@@ -99,4 +97,5 @@ Pear (c) 2001-2004 PHP Group, http://pear.php.net
Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
MIT licenced:
-Symfony2 (c) 2004-2011 Fabien Potencier, http://symfony.com/
+Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/
+Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com