diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
tree | a828f3968b151924656061bfc709b00565aff877 /Gemfile.lock | |
parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
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 6527c468c..8394b7baa 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.3.3) + httplog (1.4.0) 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.3) + httplog (~> 1.4) i18n-tasks (~> 0.9) idn-ruby iso-639 |