From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 15 Jul 2020 13:32:40 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f60b096b51b000905290d69ea05b874b60fa9e0;p=mastodon.git

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

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
---

3f60b096b51b000905290d69ea05b874b60fa9e0