From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 18 Dec 2020 23:55:12 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f9d000ebaec7732d5fcd46aa6685108a2619966b;p=mastodon.git

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

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
---

f9d000ebaec7732d5fcd46aa6685108a2619966b