Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	inc/config.php
This commit is contained in:
czaks 2013-09-17 19:12:19 -04:00
commit 8ca495e5b8
5 changed files with 54 additions and 17 deletions

View file

@ -77,6 +77,13 @@
</p>
<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
{% if post %}
<hr>
<p>You were banned for the following post on {{ board.url }}:</p>
{{ post }}
<br>
{% endif %}
{% if config.ban_page_extra %}
<p>{{ config.ban_page_extra }}</p>
{% endif %}