diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-01-13 11:16:48 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-01-13 11:16:48 +0000 |
| commit | 157a8ee3fabcc1502fe5fdda0f783eeec65af8c6 (patch) | |
| tree | 0e6c7e386150051a8723dab00c4242807108915f | |
| parent | 81b778622ed47e24a2dea59c0529d1f928c68a58 (diff) | |
| parent | 449388f3cc92c38715a64081cfb8ef8bd55680b3 (diff) | |
Merge branch 'update_json' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ gem 'foundation-rails' gem 'icalendar', '1.4.3' gem 'jquery-rails', '~> 3.0.4' gem 'jquery-ui-rails' -gem 'json' +gem 'json', '~> 1.8.1' gem 'holidays' gem 'iso_country_codes' gem 'mahoro' diff --git a/Gemfile.lock b/Gemfile.lock index 189a6478b..4a41129f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,7 +135,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.1.0) railties (>= 3.1.0) - json (1.8.1) + json (1.8.2) libv8 (3.16.14.3) linecache (0.46) rbx-require-relative (> 0.0.4) @@ -314,7 +314,7 @@ DEPENDENCIES iso_country_codes jquery-rails (~> 3.0.4) jquery-ui-rails - json + json (~> 1.8.1) locale mahoro mailcatcher |