aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-03-19 09:08:07 +0000
committerGareth Rees <gareth@mysociety.org>2015-03-19 09:08:18 +0000
commit0bc9a96a33d3be9e5d89ec9580313f4e8fb0ab00 (patch)
treedd126ef927254e2247c3e401aeb9afb3e1881644
parent73a36085e43d1d84b42eb13cd58ff4bcdfcb3b29 (diff)
Update holidays gem
http://git.io/hR7f
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d47bd2f15..1870a5edc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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.1.0'
+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 a62a90291..c829d4dcb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -127,7 +127,7 @@ GEM
tilt
highline (1.6.19)
hike (1.2.3)
- holidays (1.1.0)
+ holidays (1.2.0)
i18n (0.6.11)
icalendar (1.4.3)
iso_country_codes (0.6.1)
@@ -317,7 +317,7 @@ DEPENDENCIES
gettext (~> 2.3.9)
gettext_i18n_rails (~> 0.9.4)
globalize3!
- holidays (~> 1.1.0)
+ holidays (~> 1.2.0)
icalendar (= 1.4.3)
iso_country_codes (~> 0.6.1)
jquery-rails (~> 3.0.4)