Merge branch 'master' into update_ruby_parser
Conflicts: lib/brakeman/checks/base_check.rb lib/brakeman/processors/model_processor.rb
Showing
... | ... | @@ -19,5 +19,5 @@ Gem::Specification.new do |s| |
s.add_dependency "erubis", "~>2.6" | ||
s.add_dependency "haml", "~>3.0" | ||
s.add_dependency "sass", "~>3.0" | ||
s.add_dependency "json_pure" | ||
s.add_dependency "multi_json", "~>1.3" | ||
end |
想要评论请 注册 或 登录