diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
commit | 7324e46a3fe7be282deeda14783f4170ccf03a3c (patch) | |
tree | 79968712783f47c816d81e97604f77ff7d920b40 /railties/configs | |
parent | 1fee2fb996229236fb236bcef423930fdf1dfe2d (diff) | |
parent | 6e039e863a5d71f2a516be2eef2605be23281290 (diff) | |
download | rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.gz rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.bz2 rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.zip |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base/mime_responds.rb
Diffstat (limited to 'railties/configs')
-rw-r--r-- | railties/configs/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb index 4f3d9d22dd..ea14ce1bfc 100644 --- a/railties/configs/routes.rb +++ b/railties/configs/routes.rb @@ -37,7 +37,7 @@ ActionController::Routing::Routes.draw do |map| # Install the default routes as the lowest priority. # Note: These default routes make all actions in every controller accessible via GET requests. You should - # consider removing the them or commenting them out if you're using named routes and resources. + # consider removing or commenting them out if you're using named routes and resources. map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' end |