rails--rails/activerecord/lib/active_record
Jon Leighton 9a98c766e0 Merge branch 'master' into nested_has_many_through
Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
2010-12-12 09:55:32 +00:00
..
associations
attribute_methods
connection_adapters
locale
locking
migration
railties
relation
serializers
validations
aggregations.rb
association_preload.rb
associations.rb
attribute_methods.rb
autosave_association.rb
base.rb
callbacks.rb
counter_cache.rb
dynamic_finder_match.rb
dynamic_scope_match.rb
errors.rb
fixtures.rb
log_subscriber.rb
migration.rb
named_scope.rb
nested_attributes.rb
observer.rb
persistence.rb
query_cache.rb
railtie.rb
reflection.rb
relation.rb
result.rb
schema.rb
schema_dumper.rb
serialization.rb
session_store.rb
test_case.rb
timestamp.rb
transactions.rb
validations.rb
version.rb