From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sat, 11 May 2019 01:34:17 +0000 (+0000)
Subject: Merge branch 'feature/adminfe' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8d13c42926450aff6a0062f092cd1a5d59f99869;p=akkoma

Merge branch 'feature/adminfe' into 'develop'

Feature/adminfe

See merge request pleroma/pleroma!1116
---

8d13c42926450aff6a0062f092cd1a5d59f99869