diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -17,7 +17,7 @@ gem 'fast_gettext', '>= 0.6.0' gem 'fastercsv', '>=1.5.5' gem 'gettext_i18n_rails', '>= 0.7.1' gem 'gettext', '~> 2.3.3' -gem 'json', '~> 1.5.5' +gem 'json' gem 'mahoro' gem 'mail', :platforms => :ruby_19 gem 'memcache-client', :require => 'memcache' diff --git a/Gemfile.lock b/Gemfile.lock index 6ce3e48c1..2992b14e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM hoe (3.0.8) rake (~> 0.8) i18n (0.6.1) - json (1.5.5) + json (1.7.7) linecache (0.46) rbx-require-relative (> 0.0.4) linecache19 (0.5.12) @@ -162,7 +162,7 @@ DEPENDENCIES fastercsv (>= 1.5.5) gettext (~> 2.3.3) gettext_i18n_rails (>= 0.7.1) - json (~> 1.5.5) + json locale (>= 2.0.5) mahoro mail |