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
Showing
想要评论请 注册 或 登录