diff options
author | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:52:05 -0400 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:52:05 -0400 |
commit | 3fb9b62c6921751ebc40b74612d5412648134a9e (patch) | |
tree | caf87d98601f078e417e3c8e52209f5aec6309f5 /phpBB/adm/style/overall_footer.html | |
parent | 7b2f88686b313aebb64b6c7dade50df6a6c859c6 (diff) | |
parent | cf4e6d8a3eecce8b771005af8c9be92a08758f5f (diff) | |
download | forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.gz forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.bz2 forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.xz forums-3fb9b62c6921751ebc40b74612d5412648134a9e.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/style/overall_footer.html')
-rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 51949d4c66..689452c268 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 --> |