Merge branch 'master' into develop

This commit is contained in:
Oliver Davies 2017-05-21 22:11:58 +01:00
commit 5c896fab85
26 changed files with 239 additions and 147 deletions

View file

@ -41,3 +41,8 @@
{% include "talks-table" with { events: events, hide_talk: true } %}
</div>{# .talk-events #}
{% endblock %}
{% block stylesheets %}
<link rel="stylesheet" href="{{ site.url }}/assets/css/talk.css">
<link rel="stylesheet" href="{{ site.url }}/assets/css/talks-table.css">
{% endblock %}