perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse source 
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
This commit is contained in:
czaks 2013-08-11 09:50:33 -04:00
commit fa9bf536c3
7 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/banned.html
View file

@ -77,8 +77,8 @@
</p>
<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
{% if config.ban_page_message %}
<p>{{ config.ban_page_message }}</p>
{% if config.ban_page_extra %}
<p>{{ config.ban_page_extra }}</p>
{% endif %}
</div>
{% endfilter %}