Merge branch 'features/admin-api-user-views' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 31 Dec 2018 15:49:34 +0000 (15:49 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 31 Dec 2018 15:49:34 +0000 (15:49 +0000)
commit90e157ef803296989b41d1fbfb5096b39320f75d
tree01132d60a3977cdf69b224025280e6e06fcef07d
parent1b1e92866742e75de84201b079ffee48c769886e
parentb43d630f307110b5fa552c28c9fa0ebae09e85f2
Merge branch 'features/admin-api-user-views' into 'develop'

User/Account views: Add rights.admin

Closes #472

See merge request pleroma/pleroma!589
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/views/user_view.ex