Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 10 Dec 2019 05:55:14 +0000 (08:55 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 10 Dec 2019 05:55:14 +0000 (08:55 +0300)
commit835ac2157c53e8c85bd3759efe061dbfbdfc367e
tree266959488004bd33200c4ae4d664e665b77b2668
parent1770602747ae95d95d12c5601f99ced8699e8947
parent99623b4eca8ad4af0b8e7adc9dd4765ba2922c8b
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes

# Conflicts:
# CHANGELOG.md
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