Pratik Naik 01571c0fd7 Merge commit 'mainstream/master' ...

Conflicts:

	actionpack/lib/action_view/helpers/javascript_helper.rb
	activesupport/lib/active_support/dependencies.rb
	activesupport/lib/active_support/inflector.rb
	activesupport/lib/active_support/values/time_zone.rb

2008-06-25 12:12:30 +01:00

..

active_resource

Merge commit 'mainstream/master'

2008-06-25 12:12:30 +01:00

active_resource.rb

Support agnostic formats when calling custom methods. Closes #10635 [joerichsen]

2007-12-28 17:03:58 +00:00

activeresource.rb

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

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