Merge branch 'feature/mastofe-admin-scope' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 13 Mar 2020 18:58:52 +0000 (18:58 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 13 Mar 2020 18:58:52 +0000 (18:58 +0000)
commit38f796a5c6f526c84c8e0cc2e838c453dd70802b
tree5bba8823866abfc46bd129272f1a66c269b3785d
parent4db88242e52b00dc350b9a2ecaaea5b7ea7b21c6
parent3ef2ff3e479e69653537e6bbcc92a29590cab971
Merge branch 'feature/mastofe-admin-scope' into 'develop'

auth_controller.ex: Add admin scope to MastoFE

See merge request pleroma/pleroma!2256
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex