From: kaniini <ariadne@dereferenced.org>
Date: Mon, 30 Sep 2019 15:35:47 +0000 (+0000)
Subject: Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4f3b8d5399e2023d901412bc01ae04ee1334f499;p=akkoma

Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'

maint/1.1: update pleroma fe

See merge request pleroma/pleroma!1750
---

4f3b8d5399e2023d901412bc01ae04ee1334f499