Merge branch 'develop' into '1427-oauth-admin-scopes'
authorlain <lain@soykaf.club>
Tue, 10 Dec 2019 13:34:54 +0000 (13:34 +0000)
committerlain <lain@soykaf.club>
Tue, 10 Dec 2019 13:34:54 +0000 (13:34 +0000)
commit1ae976ac51d5ad7c224fa4d1ddee0bbd007d6787
tree1e0b4fa5d7ca5d12ac2d41ee5a077f669f64fb43
parent835ac2157c53e8c85bd3759efe061dbfbdfc367e
parent54b1b2c9c0c24165b5b32c352fa684eed28bfa93
Merge branch 'develop' into '1427-oauth-admin-scopes'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/user.ex