Merge branch 'dev'

This commit is contained in:
kleph 2013-07-24 00:47:20 +02:00
commit d18437fa54

View file

@ -6,7 +6,6 @@
<div class="well small">{% include "metadata.html" %}</div> <div class="well small">{% include "metadata.html" %}</div>
<div>{{ article.content }}</div> <div>{{ article.content }}</div>
<div> <div>
<h2>Comments</h2>
{% include "twitter.html" %} {% include "twitter.html" %}
{% if DISQUS_SITENAME %}<div id="disqus_thread"></div>{% endif %} {% if DISQUS_SITENAME %}<div id="disqus_thread"></div>{% endif %}
{% if FACEBOOK_APPID %}<div class="fb-comments" data-href="{{ FQ_SITEURL }}/{{ article.url }}" data-num-posts="10" data-width="760"></div>{% endif %} {% if FACEBOOK_APPID %}<div class="fb-comments" data-href="{{ FQ_SITEURL }}/{{ article.url }}" data-num-posts="10" data-width="760"></div>{% endif %}