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

Conflicts:
	activerecord/lib/active_record/transactions.rb

2010-12-11 00:55:25 +01:00

..

active_record

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

2010-12-11 00:55:25 +01:00

rails/generators

updating generators

2010-11-17 14:57:54 -08:00

active_record.rb

Always pull in version for frameworks (standardize autoload / require / none)

2010-10-10 16:12:04 -07:00