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/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@ -23,8 +23,8 @@
  %li
    = link_to(conference_conference_registration_path(@conference)) do
      %span.fa.fa-id-badge
-        = @conference.short_title
-        registration
+      = @conference.short_title
+      registration
 -if @conference && @conference.program
  %li
    = link_to(conference_program_proposals_path(@conference.short_title)) do