Merge branch 'master' into rails5_upgrade

2017-12-11 08:32:00 -08:00 · 2017-12-11 08:32:00 -08:00 · ddc3780fa0
commit ddc3780fa0
parent 4df6be16c7 b4fcec07be
1 changed files with 1 additions and 1 deletions
--- a/app/views/admin/cfps/index.html.haml
+++ b/app/views/admin/cfps/index.html.haml
@ -27,7 +27,7 @@
                = cfp.end_date.strftime('%A, %B %-d. %Y')
              %td
                %p
-                  = markdown(truncate(cfp.description))
+                  = truncate(cfp.description)
              %td
                = pluralize(cfp.remaining_days, 'day')
              %td