diff options
| author | czaks <marcin@6irc.net> | 2013-08-11 09:50:33 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-11 09:50:33 -0400 |
| commit | fa9bf536c356a49bf5d182a52f3ab47ea0c1b227 (patch) | |
| tree | 12b45d039c0688d03f1066a32c38f594385ed47f /templates | |
| parent | ebac98e207290d5beddb0af6c8b259e15e9da361 (diff) | |
| parent | 0de3ead32a42c5d5c1640765beb7147ea991ae1d (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/display.php
inc/mod/pages.php
js/catalog-link.js
post.php
templates/banned.html
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/banned.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/banned.html b/templates/banned.html index 401c36e5..a4498cf5 100644 --- a/templates/banned.html +++ b/templates/banned.html @@ -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 %} |