diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-07 13:45:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 13:45:43 +0100 |
| commit | 38e9c66f34d7054357a3de63834f182734d43d75 (patch) | |
| tree | 0f46795c03e883893ce01170a969f51189505d32 /Gemfile.lock | |
| parent | 84c807a0dcdfd6c3c18ee37fcb5003a92a92ce3f (diff) | |
| parent | 9c5e7805ccfc9b065aba7831f912287e02aeb1bb (diff) | |
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3335b8fbc..2c8fd59c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -643,7 +643,7 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - webpush (0.3.6) + webpush (0.3.7) hkdf (~> 0.2) jwt (~> 2.0) websocket-driver (0.7.0) |