about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-12 18:01:21 +0200
committerThibaut Girka <thib@sitedethib.com>2019-08-12 18:01:21 +0200
commitcfca28bc874125e63e7e1a3c96d94bd5a7eca108 (patch)
tree4d1f3b2c9bdcadcf0fe53372a75ba54c0c06875a
parent42588ed460c77c58b1c1ed616db2e81bdf1d6060 (diff)
parent789cb3c028a5394973830ea003757b5e1ac9f33a (diff)
Merge branch 'master' into glitch-soc/merge-upstream
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3df823eaf..b99330a25 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)