Xavier Noria af1b48926f Merge branch 'master' of git://github.com/lifo/docrails ...

Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

2011-04-23 01:11:24 +02:00

..

active_record

Merge branch 'master' of git://github.com/lifo/docrails

2011-04-23 01:11:24 +02:00

rails/generators

Remove #among? from Active Support

2011-04-13 20:25:28 +08:00

active_record.rb

Rewrote AssociationPreload.

2011-02-28 22:12:34 +00:00