Alex Gleason a659428024 Merge branch 'restricted-moderators' into 'develop' ...

AdminAPI: Optionally restrict moderators from accessing sensitive data

See merge request pleroma/pleroma!3578

2021-12-27 17:06:22 +00:00

..

mix

Merge remote-tracking branch 'origin/develop' into live-dashboard

2021-12-15 19:05:36 -05:00

phoenix/transports/web_socket

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

pleroma

Merge branch 'restricted-moderators' into 'develop'

2021-12-27 17:06:22 +00:00