Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 5 Dec 2019 21:26:31 +0000 (00:26 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 5 Dec 2019 21:26:31 +0000 (00:26 +0300)
commit13926537b644c3a4f1904c2fcd5d25fe0f284663
tree713182a80672ab37ad9284ad82b399107f050208
parentaf42c00cfffb2cd8e93857cd1cf2901113c45bd2
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
CHANGELOG.md
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs