Merge branch 'release/1.4.3'

This commit is contained in:
rascencio 2015-06-16 02:16:53 -06:00
commit 004524b7c5

View file

@ -27,10 +27,10 @@
<link href="{% static 'blog.ungleich.ch/css/clean-blog.css' %}" type="text/css" <link href="{% static 'blog.ungleich.ch/css/clean-blog.css' %}" type="text/css"
rel="stylesheet" medial="all" /> rel="stylesheet" medial="all" />
{% endaddtoblock %} {% endaddtoblock %}
{% block meta %}
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="description" content="{% page_attribute 'meta_description' %}"> <meta name="description" content="{% page_attribute 'meta_description' %}">
{% include 'meta.html' %} {% include 'meta.html' %}
{% block meta %}
{% endblock %} {% endblock %}
{% render_block "external-css" %} {% render_block "external-css" %}
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}