From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Nov 2021 17:51:41 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2b4c7beb733b809e8c9bec7492254ccf09d830b1;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream
---

2b4c7beb733b809e8c9bec7492254ccf09d830b1
diff --cc Gemfile.lock
index c49032c42,30fe32a22..198abd8e3
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -756,9 -770,9 +771,10 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
    redis (~> 4.5)
    redis-namespace (~> 1.8)
+   rexml (~> 3.2)
    rqrcode (~> 2.1)
    rspec-rails (~> 5.0)
    rspec-sidekiq (~> 3.1)