diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:51:33 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:51:33 -0400 |
| commit | cf4e6d8a3eecce8b771005af8c9be92a08758f5f (patch) | |
| tree | afa7cc8a6a7fb8fa67b3edf4af81226958e2d529 /phpBB/adm | |
| parent | 5eeb870442e01b3949489107ca80c584b36ff4ac (diff) | |
| parent | 02bba2384403d9ae0f8609786e263c511d495d82 (diff) | |
| download | forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.gz forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.bz2 forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.xz forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/9859] Changing all phpBB footers to match the new credit line
[ticket/9859] New footer copyright line with registered symbol
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/install_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 9b5494b8b6..26a3c6ab3d 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -8,7 +8,7 @@ </div> <div id="page-footer"> - Powered by <a href="http://www.phpbb.com/">phpBB</a> © phpBB Group + Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group </div> </div> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 03ca369562..b48b449597 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -9,7 +9,7 @@ <div id="page-footer"> <!-- IF S_COPYRIGHT_HTML --> - Powered by <a href="http://www.phpbb.com/">phpBB</a> © phpBB Group + Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 7276fb4b63..ac9c26a690 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -5,7 +5,7 @@ <div id="page-footer"> <!-- IF S_COPYRIGHT_HTML --> - <br />Powered by <a href="http://www.phpbb.com/">phpBB</a> © phpBB Group + <br />Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- ENDIF --> |