diff options
author | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
commit | 5f292c944155851df7e493f153cfb9d64c964388 (patch) | |
tree | 6adf5e0ff2c9fd6a198cd7faf30d294700a57096 /actionpack/lib/action_dispatch/http/response.rb | |
parent | 5836af8f8b0eb3c569c66792abf50a0485bb6f22 (diff) | |
parent | 653acac069e66f53b791caa4838a1e25de905f31 (diff) | |
download | rails-5f292c944155851df7e493f153cfb9d64c964388.tar.gz rails-5f292c944155851df7e493f153cfb9d64c964388.tar.bz2 rails-5f292c944155851df7e493f153cfb9d64c964388.zip |
Merge branch 'racksession'
Diffstat (limited to 'actionpack/lib/action_dispatch/http/response.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 151c90167b..72871e328a 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -132,7 +132,7 @@ module ActionDispatch # :nodoc: # information. attr_accessor :charset, :content_type - CONTENT_TYPE = "Content-Type" + CONTENT_TYPE = "Content-Type" cattr_accessor(:default_charset) { "utf-8" } |