Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe...
authorMark Felder <feld@FreeBSD.org>
Tue, 11 Feb 2020 16:33:41 +0000 (10:33 -0600)
committerMark Felder <feld@FreeBSD.org>
Tue, 11 Feb 2020 16:33:41 +0000 (10:33 -0600)

Trivial merge