This project is archived and is in readonly mode.
Changeset [6a975d6ca28216cfa015374c802279349e9253ca] by rick
Revision 6a975d6ca28216cfa015374c802279349e9253ca,
committed by Repository
· June 1st, 2008 @ 01:15 AM
fix changelog conflict
24 changed files
-
R
actionpack/lib/action_view/compiled_templates.rb -
R
actionpack/test/template/compiled_templates_test.rb -
M
actionmailer/CHANGELOG -
M
actionmailer/Rakefile -
M
actionmailer/lib/action_mailer/version.rb -
M
actionpack/CHANGELOG -
M
actionpack/Rakefile -
M
actionpack/lib/action_pack/version.rb -
M
activerecord/CHANGELOG -
M
activerecord/Rakefile -
M
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb -
M
activerecord/lib/active_record/validations.rb -
M
activerecord/lib/active_record/version.rb -
M
activerecord/test/cases/adapter_test.rb -
M
activerecord/test/cases/validations_test.rb -
M
activeresource/CHANGELOG -
M
activeresource/Rakefile -
M
activeresource/lib/active_resource/version.rb -
M
activesupport/CHANGELOG -
M
activesupport/lib/active_support/version.rb -
M
railties/CHANGELOG -
M
railties/Rakefile -
M
railties/lib/rails/version.rb -
M
release.rb