summaryrefslogtreecommitdiffstats
path: root/templates/faq.html
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-11 02:07:44 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-11 02:07:44 -0300
commit3ba8dcf1da127053636b5e4c78eb6e4e523e5aba (patch)
treeb8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/faq.html
parent306b82e6ef376fd3362dde41e3853dcf5688106d (diff)
parent1eacc7a42618e84766477fbcc2c32a1da3547115 (diff)
downloadaskbot-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/faq.html')
-rw-r--r--templates/faq.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/faq.html b/templates/faq.html
index 8df711ca..8adee552 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -19,7 +19,7 @@
</p>
<h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
- <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
+ <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}
</p>
</div>