diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 17:57:17 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 17:57:17 +0100 |
commit | d52e27f3dbf7a98844ba7091dcd49ad88083cd1a (patch) | |
tree | 0693c57782c2d2e5f00a70b0ad7b84418b4368b3 /Gemfile.lock | |
parent | 64225f4ac2a922c27692e8326757ec8dc83a1cc8 (diff) | |
parent | 5605b828e5149bd3a5161eb8d536ad51094afe64 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
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 bc84b7dee..b152003b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -663,7 +663,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.0.7) + webpacker (4.2.0) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -805,7 +805,7 @@ DEPENDENCIES twitter-text (~> 1.14) tzinfo-data (~> 1.2019) webmock (~> 3.7) - webpacker (~> 4.0) + webpacker (~> 4.2) webpush RUBY VERSION |