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 | |
parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
parent | 432033743c409356bd11e0d7d96f14a3cc82fb77 (diff) |
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 8d3fe095b..8a36db08d 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'htmlentities', '~> 4.3' gem 'http', '~> 4.3' gem 'http_accept_language', '~> 2.1' gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true -gem 'httplog', '~> 1.4.1' +gem 'httplog', '~> 1.4.2' gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' gem 'link_header', '~> 0.0' |