1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/railties/lib
Pratik Naik 6f3c5f6787 Merge remote branch 'mainstream/master'
Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README
2010-02-14 19:28:05 +00:00
..
generators Merge remote branch 'mainstream/master' 2010-02-14 19:28:05 +00:00
rails Merge remote branch 'mainstream/master' 2010-02-14 19:28:05 +00:00
rails.rb