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)
commitbd853199d93e03fedf43397455939c6d633fa36b
tree43f9ba6643d7d75da506954c35cc39af7f4e1d2c
parent7c1d804554cd361753f4d6f2d0ac27a9281c885f
parent6519f59d91d858273f929dc1c2a36752f6db07a9
Merge branch 'v2-suggestions' into 'develop'

V2 suggestions

See merge request pleroma/pleroma!3547
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