Merge branch 'staff-grouping' into 'develop'

Group staff by role in the About page Closes #737 See merge request pleroma/pleroma-fe!1309
2021-02-12 08:05:55 +00:00 · 2021-02-12 08:05:55 +00:00 · 8b7c367b04
commit 8b7c367b04
parent 647d75f27c 481c71517e
4 changed files with 45 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
+- Group staff members by role in the About page

 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form