diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:19:46 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:19:46 -0500 |
| commit | fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c (patch) | |
| tree | 35c9de312486b5543eadf1b50e674f3d787b145c /mediagoblin/templates | |
| parent | c47c37ed953689e70441c4c143e4c06f1645be7d (diff) | |
| parent | 4c465852d198a1d8e8562a1e25b23fa7c9b4d2b4 (diff) | |
| download | mediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.tar.lz mediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.tar.xz mediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.zip | |
Merge remote branch 'remotes/aaronw/feature410_markdown_bio'
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/profile.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html index f44defa5..d9b121f6 100644 --- 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> |