合并代码

2016-05-12 10:47:07 +08:00 · 2016-05-12 10:47:07 +08:00 · b3782c5d0c
parent 7481d96166
commit b3782c5d0c
1 changed files with 2 additions and 1 deletions
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@ -652,4 +652,5 @@ class AdminController < ApplicationController
    respond_to do |format|
      format.html
    end
-  endend
+  end
+end