Merge branch 'master' into develop
This commit is contained in:
commit
3f1a7abadc
|
@ -1,5 +1,5 @@
|
||||||
<li>
|
<li>
|
||||||
{{ talk.location }} ({{ talk.date|date('F') }}) -
|
{{ talk.location }} -
|
||||||
{% if talk.title_link %}<a href="{{ talk.title_link }}" title="{{ talk.title }}">{% endif %}
|
{% if talk.title_link %}<a href="{{ talk.title_link }}" title="{{ talk.title }}">{% endif %}
|
||||||
{{ talk.title }}
|
{{ talk.title }}
|
||||||
{% if talk.title_link %}</a>{% endif %}
|
{% if talk.title_link %}</a>{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue