diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-03 01:07:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 01:07:53 +0200 |
| commit | d2358aefecb6858eab641752a3279cdaa824eaa3 (patch) | |
| tree | c9393bbbe41a1c72bc2e40e924083c242f16588b /Gemfile.lock | |
| parent | c76d20c2a0572f1da7d2fafcd6c7a90aa6caf7f1 (diff) | |
| parent | 30df1c8476739a7439762eb678962a5254918323 (diff) | |
Merge branch 'master' into master
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 |