From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Mar 2021 08:34:29 +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=15efa32cca5c2d7dfc32b101a38081add1b3af40;p=mastodon.git

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

15efa32cca5c2d7dfc32b101a38081add1b3af40
diff --cc Gemfile
index ae4bd0d87,880bb8b51..8a77c1bf6
--- a/Gemfile
+++ b/Gemfile
@@@ -103,10 -103,8 +103,10 @@@ gem 'json-ld
  gem 'json-ld-preloaded', '~> 3.1'
  gem 'rdf-normalize', '~> 0.4'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.21'
+   gem 'fabrication', '~> 2.22'
    gem 'fuubar', '~> 2.5'
    gem 'i18n-tasks', '~> 0.9', require: false
    gem 'pry-byebug', '~> 3.9'