Merge branch 'develop' into feature/account-export
authorMark Felder <feld@FreeBSD.org>
Wed, 14 Oct 2020 20:27:15 +0000 (15:27 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 14 Oct 2020 20:27:15 +0000 (15:27 -0500)
commit1fb9452131721456adf2c19c513e6343f64825a7
tree20c679c19e83925e0fcb0d34aba7eaf831485f58
parentbc3db724030707e9903d161a70b10fe217a83212
parent20137056900f97af34f4433858cbdf69be6c9840
Merge branch 'develop' into feature/account-export
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/moderation_log.ex
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
lib/pleroma/web/router.ex
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs