diff options
author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
---|---|---|
committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
commit | 3ba8dcf1da127053636b5e4c78eb6e4e523e5aba (patch) | |
tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/500.html | |
parent | 306b82e6ef376fd3362dde41e3853dcf5688106d (diff) | |
parent | 1eacc7a42618e84766477fbcc2c32a1da3547115 (diff) | |
download | askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.gz askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.bz2 askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/500.html')
-rw-r--r-- | templates/500.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/500.html b/templates/500.html index 1990edbc..51e73178 100644 --- a/templates/500.html +++ b/templates/500.html @@ -20,8 +20,8 @@ <div id="main-body" class="headNormal"> <div style="padding:5px 0px 10px 0;line-height:25px"> <h3>{% trans "sorry, system error" %}</h3> - <br> - {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br> + <br/> + {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br/> {% trans "please report the error to the site administrators if you wish" %} <ul> <li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</li> |