Permalink
Browse files

Merge remote-tracking branch 'enki_upstream/master' into rails31

  • Loading branch information...
2 parents db0ffe7 + e2f60c8 commit 38b5c324cc4dc7a900eb1bb9afe38e6c8f73634b Adam Wróbel committed Sep 24, 2011
Showing with 0 additions and 5 deletions.
  1. +0 −5 app/controllers/application_controller.rb
@@ -1,13 +1,8 @@
class ApplicationController < ActionController::Base
protect_from_forgery
- after_filter :set_content_type
protected
- def set_content_type
- headers['Content-Type'] ||= 'text/html; charset=utf-8'
- end
-
def enki_config
@@enki_config = Enki::Config.default
end

0 comments on commit 38b5c32

Please sign in to comment.