Merge branch '2.1' into site

This commit is contained in:
Brandon Mathis 2012-06-15 12:51:18 -05:00
commit 5799278244

View File

@ -13,7 +13,7 @@ layout: default
{{ content }}
{% unless page.footer == false %}
<footer>
<p class="meta">{% include post/meta.html %}{% include custom/page-meta.html %}</p>
<p class="meta">{% include post/meta.html %}{% include custom/page_meta.html %}</p>
{% unless page.sharing == false %}
{% include post/sharing.html %}
{% endunless %}