Merge 88dcc6a92f into 9f03531708

2014-07-21 13:10:16 +00:00 · 2014-07-21 13:10:16 +00:00 · 59ed523e73
commit 59ed523e73
parent 9f03531708 88dcc6a92f
6 changed files with 39 additions and 35 deletions
--- a/app/controllers/admin/schedules_controller.rb
+++ b/app/controllers/admin/schedules_controller.rb
@ -4,7 +4,7 @@ module Admin
    skip_before_filter :verify_authenticity_token, only: [:update]
    layout 'schedule'

-    def show
+    def edit
      if @conference.nil?
        redirect_to admin_conference_index_path
        return