rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed that in some circumstances controllers outside of modules may have ↵	David Heinemeier Hansson	2005-04-10	1	-0/+1
\| \| \| \| \| \|	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
*	A hopefully more successful attempt at the Routing branch merge	David Heinemeier Hansson	2005-02-15	1	-0/+2
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Backed out of routing merge.. investigating missing patches	David Heinemeier Hansson	2005-02-15	1	-2/+0
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Merged back the Routing branch	David Heinemeier Hansson	2005-02-15	1	-0/+2
	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de