diff options
| author | halna_Tanaguru <fhalna@oceaneconsulting.com> | 2017-04-04 12:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 12:06:53 +0200 |
| commit | 3abb0f7bc708ae8ca387aee8560b9558f8b209ba (patch) | |
| tree | 6014fdec3201d9e40fa244b821bdaffc83bfa131 /Gemfile.lock | |
| parent | 3f30ae1f97717177f29711d5b99d7970c6b75b3e (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3ad535379..6e3115249 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,6 +423,8 @@ GEM unf (~> 0.1.0) tzinfo (1.2.2) thread_safe (~> 0.1) + tzinfo-data (1.2017.2) + tzinfo (>= 1.0.0) uglifier (3.0.1) execjs (>= 0.3.0, < 3) unf (0.1.4) @@ -513,6 +515,7 @@ DEPENDENCIES simplecov statsd-instrument twitter-text + tzinfo-data uglifier (>= 1.3.0) webmock will_paginate |