From 42c97e684802463882d5cf617e9d4160a013835a 2016-04-26 09:13:33
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2016-04-26 09:13:33
Subject: [PATCH] Merge remote-tracking branch 'pinaxcon/master'

---

diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
index 8d652234aa90aebb7b23547e3fa4beea3a94d778..12ab45f389d9793759f5e1f8b3294ffaac393309 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
@@ -29,10 +29,10 @@
     <dd>{{ proposal.description }}&nbsp;</dd>
 
     <dt>{% trans "Abstract" %}</dt>
-    <dd>{{ proposal.abstract|safe }}&nbsp;</dd>
+    <dd>{{ proposal.abstract_html|safe }}&nbsp;</dd>
 
     <dt>{% trans "Notes" %}</dt>
-    <dd>{{ proposal.additional_notes|safe }}&nbsp;</dd>
+    <dd>{{ proposal.additional_notes_html|safe }}&nbsp;</dd>
 
     <dt>{% trans "Speaker Bio" %}</dt>
     <dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd>