From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 20 Aug 2019 08:33:24 +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=df150da4355bb224913f6de2940c9135714fb53f;p=mastodon.git

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

Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
---

df150da4355bb224913f6de2940c9135714fb53f