From: feld <feld@feld.me>
Date: Tue, 21 Jan 2020 21:15:32 +0000 (+0000)
Subject: Merge branch 'update/adminfe-20200121-part2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=66c6f8f6ecdc6332105d6b7f0383660df4afbd1e;p=akkoma

Merge branch 'update/adminfe-20200121-part2' into 'develop'

AdminFE update, again

See merge request pleroma/pleroma!2125
---

66c6f8f6ecdc6332105d6b7f0383660df4afbd1e