Merge OSEM updates

2021-03-08 02:50:27 -08:00 · 2021-03-08 02:50:27 -08:00 · d1ca21f479
commit d1ca21f479
parent 4610ca485b 5e70690619
50 changed files with 338 additions and 382 deletions
--- a/app/views/conferences/_conference_details.html.haml
+++ b/app/views/conferences/_conference_details.html.haml
@ -12,7 +12,7 @@
              = date_string(conference.start_date, conference.end_date)
          - if conference.venue
            %p
-              = "#{conference.venue.city}/#{conference.venue.country_name}"
+              = "#{conference.city}/#{conference.country_name}"
          - unless conference.description.blank?
            %p
              = markdown(conference.description)