Merge e49906f342 into e11ad83b32

2014-05-19 15:03:52 +00:00 · 2014-05-19 15:03:52 +00:00 · 830193bdca
commit 830193bdca
parent e11ad83b32 e49906f342
6 changed files with 26 additions and 2 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -66,7 +66,7 @@ Osem::Application.routes.draw do
    end
  end

-  resources :conference, :only => [] do
+  resources :conference, only: [:show] do
    resources :proposal do
      resources :event_attachment, :controller => "event_attachments"
      patch "/confirm" => "proposal#confirm"