Browse Source

Merge branch 'master' into development

development
Godwin 7 years ago
committed by GitHub
parent
commit
d336a7cc60
  1. 2
      app/controllers/workshops_controller.rb

2
app/controllers/workshops_controller.rb

@ -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

Loading…
Cancel
Save