From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 19 Jun 2019 16:49:25 +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=032a6696227edc8f55d07d0243c10e11d6ac18da;p=mastodon.git

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

Conflicts:
- app/views/admin/settings/edit.html.haml
  Conflict on theme VS flavour/skin handling.
  Keep our version.
---

032a6696227edc8f55d07d0243c10e11d6ac18da