Jeremy Kemper 636e6b7138 Merge branch 'master' into i18n-merge ...

Conflicts:

	actionpack/lib/action_view/helpers/form_options_helper.rb
	activerecord/lib/active_record/validations.rb

2008-07-17 11:52:56 -07:00

..

active_record

Merge branch 'master' into i18n-merge

2008-07-17 11:52:56 -07:00

active_record.rb

Renamed lang/ to locale/ because that's what we seem to

2008-06-21 11:35:02 +02:00

activerecord.rb

Allow frameworks to be required by their gem name (closes #8845) [drnic]

2007-09-22 18:15:05 +00:00