diff options
| author | ctrlcctrlv <wizardchan@hush.com> | 2013-08-11 15:36:17 +0000 |
|---|---|---|
| committer | ctrlcctrlv <wizardchan@hush.com> | 2013-08-11 15:36:17 +0000 |
| commit | b9ec342750009037893e1bb06640905c6d88b5dd (patch) | |
| tree | 18d253df2e6acaf9d156c1742c233d51357af478 /templates | |
| parent | efebd3022198995395859ddc07b1a48828ef1f89 (diff) | |
| parent | aeb33169eaa2c18cbf6d6791dc35e911136f983a (diff) | |
Merge conflict
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 %} |