Vijay Dev 41231ef6c6 Merge branch 'master' of github.com:rails/docrails ... Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb activerecord/lib/active_record/type/value.rb		2014-08-19 16:28:53 +00:00
..
action_view	Merge branch 'master' of github.com:rails/docrails	2014-08-19 16:28:53 +00:00
action_view.rb	Now only requiring Loofah in the places where it is needed.	2014-06-16 21:04:14 +02:00