gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge OSEM updates

Browse source
This commit is contained in:
Michael Ball 2021-03-08 02:50:27 -08:00
commit d1ca21f479
50 changed files with 338 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -222,6 +222,8 @@ Osem::Application.routes.draw do
get '/admin' => redirect('/admin/conferences')
get '/calendar' => 'conferences#calendar'
unless ENV['OSEM_ROOT_CONFERENCE'].blank?
root to: redirect("/conferences/#{ENV['OSEM_ROOT_CONFERENCE']}")
else