Merge branch 'master' into support_neighbors

2017-03-18 14:13:22 +00:00 · 2017-03-18 14:13:22 +00:00 · 3069ae44a4
commit 3069ae44a4
parent 1a211aceb5 567cc8964f
42 changed files with 1027 additions and 204 deletions
--- a/templates/article.html
+++ b/templates/article.html
@ -67,6 +67,8 @@
    {% endfor %}
    </ul>
  </div>
+  {% else %}
+    <div class="addthis_relatedposts_inline">
  {% endif %}

  {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.article_bottom %}