Merge branch 'v2-suggestions' into 'develop'
authorAlex Gleason <alex@alexgleason.me>
Sun, 19 Dec 2021 17:31:17 +0000 (17:31 +0000)
committerAlex Gleason <alex@alexgleason.me>
Sun, 19 Dec 2021 17:31:17 +0000 (17:31 +0000)
V2 suggestions

See merge request pleroma/pleroma!3547

1  2 
docs/development/API/admin_api.md
lib/pleroma/moderation_log.ex
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex
lib/pleroma/web/router.ex
test/pleroma/user_test.exs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge