Merge branch 'master' of github.com:blindsidenetworks/greenlight

2016-10-18 16:26:02 -04:00
parent 0d216adc52 421e0c3c37
commit 875f2d2a12
13 changed files with 96 additions and 35 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -5,6 +5,7 @@ Rails.application.routes.draw do
  get '/meeting(/:id)', to: 'landing#index', as: :landing, :resource => "meeting"
  get '/auth/:provider/callback', to: 'sessions#create'
  get '/logout', to: 'sessions#destroy'
+  get '/rooms/:name', to: 'landing#room'

  root to: 'landing#index', :resource => "meeting"
  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html