summaryrefslogtreecommitdiffstats
path: root/templates/authopenid/settings.html
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
commit0b39716196977f9a368cfded6a1d05244ca724d0 (patch)
treefd1a31f04a866cab270a7c4ea846206782009823 /templates/authopenid/settings.html
parent02409029d958cced911b3b18e025cf495656cb04 (diff)
parent8d5ef067c8c4e7de276d559af67417f5324f9171 (diff)
downloadaskbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.gz
askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.bz2
askbot-0b39716196977f9a368cfded6a1d05244ca724d0.zip
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts: forum/auth.py forum/models.py forum/views.py
Diffstat (limited to 'templates/authopenid/settings.html')
-rw-r--r--templates/authopenid/settings.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ffd5dd8f..a373324e 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,4 +1,5 @@
{% extends "base_content.html" %}
+<!-- settings.html -->
{% load i18n %}
{% block head %}
@@ -39,3 +40,4 @@
</dl>
</div>
{% endblock %}
+<!-- end settings.html -->