diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 20:53:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 20:53:51 +0200 |
| commit | 969d04385157175dc9c9f46987976d8fc5771707 (patch) | |
| tree | 53e8e98051c24ac4fb32ce5692e241b6a6391de3 | |
| parent | f3ac4a44110872df8c331319b3c506b966406f6a (diff) | |
| parent | 7802ebd5f3de1ef4b7384f24fe5067977aff8da3 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index caa8452a7..274d4601b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,7 +112,7 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) - bcrypt (3.1.13) + bcrypt (3.1.12) benchmark-ips (2.7.2) better_errors (2.5.1) coderay (>= 1.0.0) |