diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-05-28 18:19:20 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-28 18:19:20 +0200 |
commit | 3ab06314f1250d737a4abdb1271ac062d4463b99 (patch) | |
tree | aeed6a4aa404a4829a9dbd0ef31f526e4b6f9dae /tests/functional/fixtures | |
parent | cf12e179441f0ae247be3fd448a4d7fb16e089ec (diff) | |
parent | c8e7b2c5d4a8bbc33cc9cf394fa2a4f978cca63c (diff) | |
download | forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.gz forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.bz2 forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.xz forums-3ab06314f1250d737a4abdb1271ac062d4463b99.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12594] Replace phpBB Group with phpBB Limited
[ticket/12594] Update footer credit lines
[ticket/12594] Remove @package tags and update file headers
Diffstat (limited to 'tests/functional/fixtures')
6 files changed, 42 insertions, 24 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php index c6d801881f..371ab7c967 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php index c59b3c6820..ee797c718d 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php index 9b319dd35f..cdbdf40465 100644 --- a/tests/functional/fixtures/ext/foo/bar/event/permission.php +++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php index 8fa7ac97da..3a60019f68 100644 --- a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php +++ b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php index fdf9cc3241..4c74442639 100644 --- a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php index cd3dacc9db..f1cd03f4ab 100644 --- a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php @@ -1,10 +1,13 @@ <?php - /** * -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ |