Merge remote branch 'upstream/master' into dev/mount_storage

[mediagoblin.git] / mediagoblin / templates / mediagoblin / utils / profile.html

diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
index f44defa51c3e1726c937297b0ec5b8774cf98d4a..63024b77e3cf8c71ac87d3ab2a0e65be1babb93b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -18,9 +18,9 @@
 
 {% block profile_content -%}
   {% if user.bio %}
-    <p>
-      {{ user.bio }}
-    </p>
+    {% autoescape False %}
+      <p>{{ user.bio_html }}</p>
+    {% endautoescape %}
   {% endif %}
   {% if user.url %}
     <p>