rails--rails/activerecord/lib
Yehuda Katz 3030bc90c9 Merge commit 'rails/3-0-unstable'
Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb
2009-01-30 11:30:27 -08:00
..
active_record Merge commit 'rails/3-0-unstable' 2009-01-30 11:30:27 -08:00
active_record.rb Bump up the year in MIT license files 2009-01-18 05:28:21 +00:00
activerecord.rb Allow frameworks to be required by their gem name (closes #8845) [drnic] 2007-09-22 18:15:05 +00:00