diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-15 17:16:11 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-15 18:23:05 +0000 |
| commit | 8e69a9372fb29bc8107ee8c542f9408efa54b76e (patch) | |
| tree | 763662478955bb44584b6abd9a060c6aa7863f53 /Gemfile.lock | |
| parent | ceae995a5356a651f5e466afc2cd30ff70fe1555 (diff) | |
Allow import of holidays from feed or built-in suggestions
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ca813eb1a..ffb2286ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,10 @@ GEM tilt highline (1.6.19) hike (1.2.3) + holidays (1.0.8) i18n (0.6.11) + icalendar (1.4.3) + iso_country_codes (0.6.1) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -310,6 +313,9 @@ DEPENDENCIES gettext gettext_i18n_rails globalize3! + holidays + icalendar (= 1.4.3) + iso_country_codes jquery-rails (~> 3.0.4) jquery-ui-rails json |