Merge branch 'master' into develop
This commit is contained in:
commit
5c896fab85
26 changed files with 239 additions and 147 deletions
|
@ -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 %}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue