diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-09 12:56:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 12:56:12 +0100 |
| commit | d3aaa08730901e7c97c6aeb1ebf56f2a027c78a2 (patch) | |
| tree | 9fcb99dab28b01e0f85fbe7f27f406f92a031903 /Gemfile.lock | |
| parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
| parent | 432033743c409356bd11e0d7d96f14a3cc82fb77 (diff) | |
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f5076302e..e33748197 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM http-parser (1.2.1) ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) - httplog (1.4.1) + httplog (1.4.2) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.8.2) @@ -713,7 +713,7 @@ DEPENDENCIES http (~> 4.3) http_accept_language (~> 2.1) http_parser.rb (~> 0.6)! - httplog (~> 1.4.1) + httplog (~> 1.4.2) i18n-tasks (~> 0.9) idn-ruby iso-639 |