aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_ext.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-12-15 18:22:35 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-15 18:22:35 -0800
commit89056885b030b981193d73ebde56cf60829a924c (patch)
tree9d432f7226754115ac4d2ef8aa1134221ff294bb /actionpack/lib/action_controller/cgi_ext.rb
parent19be3d35b38b6685789d8d343617d465a3652717 (diff)
parent43ac42c46a462e1453b1b97da00e11bff7bba55d (diff)
downloadrails-89056885b030b981193d73ebde56cf60829a924c.tar.gz
rails-89056885b030b981193d73ebde56cf60829a924c.tar.bz2
rails-89056885b030b981193d73ebde56cf60829a924c.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_ext.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext.rb b/actionpack/lib/action_controller/cgi_ext.rb
index f3b8c08d8f..406b6f06d6 100644
--- a/actionpack/lib/action_controller/cgi_ext.rb
+++ b/actionpack/lib/action_controller/cgi_ext.rb
@@ -1,7 +1,6 @@
require 'action_controller/cgi_ext/stdinput'
require 'action_controller/cgi_ext/query_extension'
require 'action_controller/cgi_ext/cookie'
-require 'action_controller/cgi_ext/session'
class CGI #:nodoc:
include ActionController::CgiExt::Stdinput