diff options
author | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
---|---|---|
committer | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
commit | a4e533f1588a5d34dca4ab462b58ddd83eed37c5 (patch) | |
tree | 58bb3b57ec5664e094ae151c18b6c1915256e364 /vendor/gems/json-1.5.1 | |
parent | d473fce1d0451c913d3ef697d3b45bd58c6fff54 (diff) | |
parent | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (diff) |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'vendor/gems/json-1.5.1')
-rw-r--r-- | vendor/gems/json-1.5.1/.specification | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/gems/json-1.5.1/.specification b/vendor/gems/json-1.5.1/.specification index 26813246a..323455f68 100644 --- a/vendor/gems/json-1.5.1/.specification +++ b/vendor/gems/json-1.5.1/.specification @@ -36,6 +36,7 @@ post_install_message: rdoc_options: [] require_paths: +- bin - lib required_ruby_version: !ruby/object:Gem::Requirement requirements: @@ -56,10 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: json -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: JSON Implementation for Ruby test_files: [] - |