From e8610a9e624665201c4bcd356c2b7b9f0768ebed Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Tue, 4 May 2021 16:54:01 -0700
Subject: [PATCH] merge master

---
 Gemfile.lock | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 10c6a0bf..714cfafe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -722,12 +722,11 @@ DEPENDENCIES
   json-schema
   leaflet-rails
   letter_opener
-  letter_opener_web (~> 1.0)
-  mimemagic
+  letter_opener_web
   mina
   mini_magick
   money-rails
-  nokogiri (>= 1.8.1)
+  nokogiri
   omniauth
   omniauth-discourse
   omniauth-facebook