1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/railties/test
Emilio Tagua 0b702ba3de Merge remote branch 'rails/master' into identity_map
Conflicts:
	activerecord/lib/active_record/associations/association.rb
	activerecord/lib/active_record/fixtures.rb
2011-02-18 15:29:33 -03:00
..
application
fixtures
generators
isolation
railties
abstract_unit.rb
backtrace_cleaner_test.rb
generators_test.rb
initializable_test.rb
paths_test.rb
rails_info_controller_test.rb
rails_info_test.rb
script_rails_loader_test.rb