Merge branch 'staff-plug' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 5 Aug 2021 05:51:22 +0000 (05:51 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 5 Aug 2021 05:51:22 +0000 (05:51 +0000)
commit5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0
tree387a8915bdb6ff1295f4f0872b2e6bc97e177831
parentd8a986c9e893de8eed3aa336a557695669b1ffee
parent44ede0657f2da0a761de76b1f9822a293430d497
Merge branch 'staff-plug' into 'develop'

Moderators: add UserIsStaffPlug

See merge request pleroma/pleroma!3495