diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 17:36:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 17:36:21 +0100 |
| commit | a01e916737c39c8d9d53c82647c92871f5c18caa (patch) | |
| tree | ce1e412e48bac2372f9ae61673851d0d392721bd /phpBB/docs/INSTALL.html | |
| parent | d018b0b5f161c3f0c468dc01af301b4b745c30cb (diff) | |
| parent | fd55d64996637084096ec83f84c5f007959c9fcd (diff) | |
| download | forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.gz forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.bz2 forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.xz forums-a01e916737c39c8d9d53c82647c92871f5c18caa.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9916] Changing header in non-distributed files
[ticket/9916] Changing coding guidelines license
[ticket/9916] Updating License in the header
Conflicts:
tests/mock/cache.php
Diffstat (limited to 'phpBB/docs/INSTALL.html')
| -rw-r--r-- | phpBB/docs/INSTALL.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index c8c3bcb6ed..9b27ac06bc 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -75,7 +75,7 @@ <li><a href="#webserver_configuration">Webserver configuration</a></li> </ol> </li> - <li><a href="#disclaimer">Disclaimer</a></li> + <li><a href="#disclaimer">Copyright and disclaimer</a></li> </ol> </div> @@ -424,7 +424,7 @@ <div class="content"> - <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p> + <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p> </div> |