diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-07 22:11:47 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-07 22:11:47 +0530 |
commit | bcd22696585b6be6f088780b37195ad0b1ff0fde (patch) | |
tree | b1a5c92ed3da59da326fc2bb545c1ade8e59ce19 /actionpack/lib/action_dispatch | |
parent | 91b0ffc4fadb69590cc7197fc6497d146f469ce7 (diff) | |
parent | ef493c9259d62a761257de7ffd04258811a9f233 (diff) | |
download | rails-bcd22696585b6be6f088780b37195ad0b1ff0fde.tar.gz rails-bcd22696585b6be6f088780b37195ad0b1ff0fde.tar.bz2 rails-bcd22696585b6be6f088780b37195ad0b1ff0fde.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index e039eb1288..26f4c16218 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -38,7 +38,7 @@ module Mime # respond_to do |format| # format.html # format.ics { render :text => post.to_ics, :mime_type => Mime::Type["text/calendar"] } - # format.xml { render :xml => @people.to_xml } + # format.xml { render :xml => @people } # end # end # end |