diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-06 14:38:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 14:38:26 -0400 |
| commit | 62a0c307545d6caa27b7e102bc193c6c117351c6 (patch) | |
| tree | 1f795cfc6f1b6e390065a8a263ac8e348daae7f6 /Gemfile.lock | |
| parent | 2de047dbeb88215e1b5b86c1154e7d0f3002f9ba (diff) | |
| parent | 66614f6b67402ec526a699760d1c21c586834da8 (diff) | |
| download | rails-62a0c307545d6caa27b7e102bc193c6c117351c6.tar.gz rails-62a0c307545d6caa27b7e102bc193c6c117351c6.tar.bz2 rails-62a0c307545d6caa27b7e102bc193c6c117351c6.zip | |
Merge pull request #33574 from lsylvester/change-i18n-defaults-behaviour-to-match-i18n-1.1.0
update I18n fallbacks configuration to be compatible with i18n 1.1.0
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 50b93abae0..52cde3841a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM hiredis (0.6.1-java) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.0.1) + i18n (1.1.0) concurrent-ruby (~> 1.0) image_processing (1.6.0) mini_magick (~> 4.0) @@ -525,7 +525,6 @@ DEPENDENCIES delayed_job_active_record google-cloud-storage (~> 1.11) hiredis - i18n (~> 1.0.1) image_processing (~> 1.2) json (>= 2.0.0) kindlerb (~> 1.2.0) |