Merge branch 'add-admin-and-moderator-fields' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)
commit18e783bcb225f59dd9efc652c82d6e23492edbec
tree6d716b43a3a33a829c544b346275c2319c110092
parent09b71a9053fe66ba8f4fca940f22eaffbf4af215
parent035eaeb9b8702ed233e8bb589a78838efd1f131e
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