Merge remote-tracking branch 'origin/master' into talks

This commit is contained in:
Oliver Davies 2015-09-12 13:14:12 +01:00
commit 1432f571d7

View file

@ -97,7 +97,7 @@
{% block scripts %}{% endblock scripts %} {% block scripts %}{% endblock scripts %}
{% if page.tweets is defined and page.tweets == true %} {% if page.tweets %}
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
{% endif %} {% endif %}