moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-11-16 06:05:00 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.1

Browse Source 
Conflicts:
	.themes/classic/source/_includes/article.html
This commit is contained in:
Brandon Mathis 2012-05-22 09:28:59 -05:00
commit 82386a0426
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.themes/classic/source/_includes/article.html
View File

@ -12,7 +12,7 @@
<div class="entry-content">{{ content }}</div>
{% if index %}
<footer>
{% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
{% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
<p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">View comments &raquo;</a></p>
{% endif %}
{% if excerpted != 'false' %}