diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-15 16:11:04 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-15 16:11:04 +0100 |
| commit | da706b6c05ee7d0be15b59cf0fdec7f6d3ed58ec (patch) | |
| tree | 3ed7a8bda9140abad6001080aaf9c29b7fa1f0d8 /app/controllers/api_controller.rb | |
| parent | 8c29864c8a84d0113209a33c4421abd10fd47c5b (diff) | |
| parent | 576b58803635de9d16dd7cd1c2a68b692ba11743 (diff) | |
Merge branch 'set-file-encodings' into rails-3-develop
Diffstat (limited to 'app/controllers/api_controller.rb')
| -rw-r--r-- | app/controllers/api_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 6f83d89d6..779ae04a6 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- class ApiController < ApplicationController before_filter :check_api_key before_filter :check_external_request, |