diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
| commit | f24cc98afa25ad6010ae5316eecc15dfdb3fa79b (patch) | |
| tree | c32fecb16bb2097da7dfdf90e6915fce0bf1a425 /app/controllers/admin_controller.rb | |
| parent | 823e58dc69960c600230b10604a0051359173f85 (diff) | |
| parent | 3c0604cf900ad274d8f6ff421d39854ccbf4b6af (diff) | |
Merge branch 'release/0.21'0.21.0.0
Conflicts:
locale/cy/app.po
locale/es_NI/app.po
locale/hr/app.po
locale/is_IS/app.po
locale/sr@latin/app.po
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 3bf40b8f9..7760c372b 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -9,7 +9,6 @@ require 'fileutils' class AdminController < ApplicationController layout "admin" before_filter :authenticate - protect_from_forgery # See ActionController::RequestForgeryProtection for details # action to take if expecting an authenticity token and one isn't received def handle_unverified_request |