From: feld <feld@feld.me>
Date: Fri, 6 Mar 2020 16:03:24 +0000 (+0000)
Subject: Merge branch 'revert-67cc4dce' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=46f118d7e1d570fa4f4d1235f9c38c6040f814fb;p=akkoma

Merge branch 'revert-67cc4dce' into 'develop'

Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276
---

46f118d7e1d570fa4f4d1235f9c38c6040f814fb