From: kaniini <nenolod@gmail.com>
Date: Wed, 6 Feb 2019 18:19:47 +0000 (+0000)
Subject: Merge branch 'add-admin-and-moderator-fields' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=18e783bcb225f59dd9efc652c82d6e23492edbec;p=akkoma

Merge branch 'add-admin-and-moderator-fields' into 'develop'

Add admin and moderator badges to user view and make their visibility configurable

See merge request pleroma/pleroma!767
---

18e783bcb225f59dd9efc652c82d6e23492edbec