diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-04-08 13:03:03 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-04-08 13:03:03 +0100 |
| commit | c3fb1781333da69be5736c35e96ca55ccd4ba4db (patch) | |
| tree | a44acc7a780d94820131b0a56421badfb2a7140b | |
| parent | aeec7c7a4736af220c3b91f89a33e233585fd454 (diff) | |
| parent | 0bc9a96a33d3be9e5d89ec9580313f4e8fb0ab00 (diff) | |
Merge branch 'update_holidays' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -15,7 +15,7 @@ gem 'icalendar', '1.4.3' gem 'jquery-rails', '~> 3.0.4' gem 'jquery-ui-rails', '~> 4.1.0' gem 'json', '~> 1.8.1' -gem 'holidays', '~> 1.0.8' +gem 'holidays', '~> 1.2.0' gem 'iso_country_codes', '~> 0.6.1' gem 'mahoro', '~> 0.4' gem 'memcache-client', '~> 1.8.5' diff --git a/Gemfile.lock b/Gemfile.lock index 9fb037ec7..32b09a723 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM tilt highline (1.6.19) hike (1.2.3) - holidays (1.0.8) + holidays (1.2.0) i18n (0.6.11) icalendar (1.4.3) iso_country_codes (0.6.1) @@ -318,7 +318,7 @@ DEPENDENCIES gettext (~> 2.3.9) gettext_i18n_rails (~> 0.9.4) globalize3! - holidays (~> 1.0.8) + holidays (~> 1.2.0) icalendar (= 1.4.3) iso_country_codes (~> 0.6.1) jquery-rails (~> 3.0.4) |