Merge branch 'develop' into feature/multiple-users-force-password-reset
authorMaxim Filippov <colixer@gmail.com>
Tue, 5 Nov 2019 01:36:47 +0000 (11:36 +1000)
committerMaxim Filippov <colixer@gmail.com>
Tue, 5 Nov 2019 01:36:47 +0000 (11:36 +1000)
commit2cbfa256fd911b66a28c78008d1d622bfdb5d345
treefb4217abd5bd1edc85f61e1b37858da1c35cd098
parentab5c8ec9fac8045cd5a3f25526f302bc9249e1bf
parentfee127696308dbec9cff6b2a9b399cf2877cf445
Merge branch 'develop' into feature/multiple-users-force-password-reset
CHANGELOG.md
lib/pleroma/moderation_log.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs