David Heinemeier Hansson 87bed3af47 Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar] ...

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2005-04-10 15:01:35 +00:00

..

admin

A hopefully more successful attempt at the Routing branch merge

2005-02-15 01:45:35 +00:00

content_controller.rb

Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar]

2005-04-10 15:01:35 +00:00

resource_controller.rb

A hopefully more successful attempt at the Routing branch merge

2005-02-15 01:45:35 +00:00