Merge branch 'source' into add-dublin-talks

2017-09-06 08:48:21 +01:00 · 2017-09-06 08:48:21 +01:00 · bb9c2cf1bd
commit bb9c2cf1bd
parent 54f5ff5814 956d27489d
24 changed files with 86 additions and 99 deletions
--- a/source/talks.md
+++ b/source/talks.md
@ -21,14 +21,12 @@ There is also information about events that I’ve attended and spoken at on my
    {% if date.date >= 'today'|date('Y-m-d') %}
        {% set upcoming_events = upcoming_events|merge([{
            date: date,
-            event: site.events.events[date.event],
-            talks: data.talks,
+            event: site.events.events[date.event]
        }]) %}
    {% else %}
        {% set past_events = past_events|merge([{
            date: date,
-            event: site.events.events[date.event],
-            talks: data.talks,
+            event: site.events.events[date.event]
        }]) %}
    {% endif %}
 {% endfor %}