Merge branch 'master' into development

2017-08-12 11:25:48 -07:00
parent d23c5034ed f54c09f248
commit d336a7cc60
1 changed files with 1 additions and 1 deletions
@@ -366,7 +366,7 @@ class WorkshopsController < ApplicationController
      @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
      @main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register"
      @main_title_vars = { vars: { title: @this_conference.title } }
-      render register_path(@this_conference.slug)
+      render 'conferences/register'
    end
  end