1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-02 23:12:46 +02:00

Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2019-08-16 12:24:46 +02:00
commit 826cc9751a
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 19 additions and 3 deletions

View File

@ -6,7 +6,9 @@
<div id="page-footer">
<div class="copyright">
Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
{% if S_COPYRIGHT_HTML %}
{{ CREDIT_LINE }}
{% endif %}
</div>
</div>
</div>

View File

@ -42,7 +42,14 @@
<div id="page-footer" class="page-footer">
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
<div class="copyright">
<p>{{ CREDIT_LINE }}
</p>
{% if TRANSLATION_INFO %}
<p>{{ TRANSLATION_INFO }}
</p>
{% endif %}
</div>
</div>
</div>

View File

@ -38,7 +38,14 @@
<div id="page-footer" class="page-footer">
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
<div class="copyright">
<p>{{ CREDIT_LINE }}
</p>
{% if TRANSLATION_INFO %}
<p>{{ TRANSLATION_INFO }}
</p>
{% endif %}
</div>
</div>
</div>