projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'
[mediagoblin.git]
/
mediagoblin
/
templates
/
mediagoblin
/
user_pages
/
collection.html
diff --git
a/mediagoblin/templates/mediagoblin/user_pages/collection.html
b/mediagoblin/templates/mediagoblin/user_pages/collection.html
index f1ab7a428f6a24f61904ae06cbd3ba02a1d9df40..5a7baadde7ff49fa3817dc570be2736ed19a7104 100644
(file)
--- a/
mediagoblin/templates/mediagoblin/user_pages/collection.html
+++ b/
mediagoblin/templates/mediagoblin/user_pages/collection.html
@@
-57,7
+57,9
@@
{% endif %}
<p>
- {{ collection.description }}
+ {% autoescape False %}
+ {{ collection.description_html }}
+ {% endautoescape %}
</p>
{{ collection_gallery(request, collection_items, pagination) }}