José Valim f915f9e339 Merge branch 'master' into app ...

Conflicts:
	railties/lib/rails/application.rb

2010-01-23 22:53:26 +01:00

..

active_record

Merge branch 'master' into app

2010-01-23 22:53:26 +01:00

generators

Generators load path now will be Ruby load path. If you want to use rspec:install generator, you need generators/rspec/install_generator in your load path.

2010-01-18 16:21:11 +01:00

active_record.rb

Revert "Refactoring attributes/types" [#3348 state:open]

2010-01-22 02:37:07 +05:30