Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 10 Jan 2020 13:18:32 +0000 (16:18 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 10 Jan 2020 13:18:32 +0000 (16:18 +0300)
commit39ce894a07cc546092e9c3fcdedabd2b750524c0
treecf36180e1effe3c90a40174e9510ab5cbffdba3f
parent6c94b7498b889ffe13691123c94bbe5440786852
parent05ca420c0994b079116b40ea5a84214b50d56d0e
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks

# Conflicts:
# lib/pleroma/user.ex
config/config.exs
lib/pleroma/user.ex
test/web/oauth/oauth_controller_test.exs
test/web/pleroma_api/controllers/emoji_api_controller_test.exs