From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 2 Sep 2021 08:52:09 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f9185c72a9aeaaa09eec6186776108dafa27d3fd;p=mastodon.git

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

f9185c72a9aeaaa09eec6186776108dafa27d3fd
diff --cc Gemfile.lock
index 8fdc79f39,0f020c4e3..c829eabaa
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -759,10 -759,9 +760,10 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
    redis (~> 4.4)
    redis-namespace (~> 1.8)
-   rqrcode (~> 2.0)
+   rqrcode (~> 2.1)
    rspec-rails (~> 5.0)
    rspec-sidekiq (~> 3.1)
    rspec_junit_formatter (~> 0.4)