Merge master

2021-03-08 16:48:06 -08:00 · 2021-03-08 16:48:06 -08:00 · f3271f5cdc
commit f3271f5cdc
parent fd4d776e2c 743188d162
21 changed files with 58 additions and 37 deletions
--- a/app/views/conferences/_conference_details.html.haml
+++ b/app/views/conferences/_conference_details.html.haml
@ -15,7 +15,7 @@
              = "#{conference.city}/#{conference.country_name}"
          - unless conference.description.blank?
            %p
-              = markdown(conference.description)
+              = markdown(conference.description, escape_html=false)
        .col-md-2
          .btn-group-vertical
            - if !@conference || @conference != conference