Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'pinaxcon/master'

Browse source
This commit is contained in:
Christopher Neugebauer 2016-04-26 19:13:33 +10:00
commit 42c97e6848
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pinaxcon/templates/symposion/proposals/_proposal_fields.html
View file

@ -29,10 +29,10 @@
<dd>{{ proposal.description }}&nbsp;</dd> <dd>{{ proposal.description }}&nbsp;</dd>
<dt>{% trans "Abstract" %}</dt> <dt>{% trans "Abstract" %}</dt>
<dd>{{ proposal.abstract|safe }}&nbsp;</dd> <dd>{{ proposal.abstract_html|safe }}&nbsp;</dd>
<dt>{% trans "Notes" %}</dt> <dt>{% trans "Notes" %}</dt>
<dd>{{ proposal.additional_notes|safe }}&nbsp;</dd> <dd>{{ proposal.additional_notes_html|safe }}&nbsp;</dd>
<dt>{% trans "Speaker Bio" %}</dt> <dt>{% trans "Speaker Bio" %}</dt>
<dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd> <dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd>