summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-21 18:01:46 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-21 18:01:46 -0400
commita485a301207f401dc9a8d838bcb3442fdbe8bccd (patch)
tree95d6a74f786bcf6dabaa389089cec840221c8bcd
parentd0b3c53e0a3e52e6ab6f40e0258278756d6d2517 (diff)
parentd5f15c9360e5ee94ab49df2a52331f7d2c2a3a56 (diff)
downloadaskbot-a485a301207f401dc9a8d838bcb3442fdbe8bccd.tar.gz
askbot-a485a301207f401dc9a8d838bcb3442fdbe8bccd.tar.bz2
askbot-a485a301207f401dc9a8d838bcb3442fdbe8bccd.zip
Merge branch 'master' into user-groups
-rw-r--r--askbot/db0
-rw-r--r--askbot/skins/default/templates/question/new_answer_form.html1
2 files changed, 0 insertions, 1 deletions
diff --git a/askbot/db b/askbot/db
deleted file mode 100644
index e69de29b..00000000
--- a/askbot/db
+++ /dev/null
diff --git a/askbot/skins/default/templates/question/new_answer_form.html b/askbot/skins/default/templates/question/new_answer_form.html
index 9c0258f7..76772abf 100644
--- a/askbot/skins/default/templates/question/new_answer_form.html
+++ b/askbot/skins/default/templates/question/new_answer_form.html
@@ -1,6 +1,5 @@
<form
id="fmanswer"
- {% if user == question.author %}style="display:none"{% endif %}
action="{% url answer question.id %}"
method="post"
>{% csrf_token %}