Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 5 insertions, 3 deletions

diff --git a/tuxlite_tbs/templates/article.html b/tuxlite_tbs/templates/article.html
index 766de73..b5f3a63 100644
--- a/tuxlite_tbs/templates/article.html
+++ b/tuxlite_tbs/templates/article.html
@@ -9,9 +9,11 @@
         <div>{{ article.content }}</div>
 	
         <hr>
-    	   
-        <h2>Comments</h2>
+
 	{% include "twitter.html" %}
-	{% include 'disqus.html' %}
+    {% if DISQUS_SITENAME %}
+        <h2>Comments</h2>
+        {% include "disqus.html" %}
+    {% endif %}
     </div>
 {% endblock %}