diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
| commit | 6e0e5e5bed89ff2093e1cca3fa50310f678565fd (patch) | |
| tree | ae9a198a8134e90ab2a140d699ed6f3248f467cc /vendor/gems/json-1.5.1 | |
| parent | e286a5a91e449ef01b5ce5f23654d1316bffaf53 (diff) | |
| parent | a9002cc8e749df6f5961acab8e3e61fd21987fc1 (diff) | |
Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop
Conflicts:
app/models/request_mailer.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: [] - |