diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:22:55 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:22:55 +0200 |
| commit | e309fce6aaaf5d730a76d48a03b1cbe7b0628c85 (patch) | |
| tree | f995fc6b62defd8637774b5f8a4c2d561d8813e1 | |
| parent | 51b9ea3e86bce6bbdee2de0699caf5375c25bf67 (diff) | |
| parent | b92787a1324694e571157d134a57a8253d13efd8 (diff) | |
| download | forums-e309fce6aaaf5d730a76d48a03b1cbe7b0628c85.tar forums-e309fce6aaaf5d730a76d48a03b1cbe7b0628c85.tar.gz forums-e309fce6aaaf5d730a76d48a03b1cbe7b0628c85.tar.bz2 forums-e309fce6aaaf5d730a76d48a03b1cbe7b0628c85.tar.xz forums-e309fce6aaaf5d730a76d48a03b1cbe7b0628c85.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12637] Fixup all incorrect uses of file header.
[ticket/12637] Correctly escape the file header in coding-guidelines.html.
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 2 | ||||
| -rw-r--r-- | tests/console/cron/run_test.php | 2 | ||||
| -rw-r--r-- | tests/console/cron/tasks/simple.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 43417d0078..173c7e5441 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -127,7 +127,7 @@ * * This file is part of the phpBB Forum Software package. * -* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @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 diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php index 8908c536c0..ff251cff3c 100644 --- a/tests/console/cron/run_test.php +++ b/tests/console/cron/run_test.php @@ -3,7 +3,7 @@ * * This file is part of the phpBB Forum Software package. * -* @copyright (c) phpBB Limited +* @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 diff --git a/tests/console/cron/tasks/simple.php b/tests/console/cron/tasks/simple.php index c814c29bde..194c52afe1 100644 --- a/tests/console/cron/tasks/simple.php +++ b/tests/console/cron/tasks/simple.php @@ -3,7 +3,7 @@ * * This file is part of the phpBB Forum Software package. * -* @copyright (c) phpBB Limited +* @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 |