aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/websocket_handler.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-12 19:50:51 +0000
committerkaniini <nenolod@gmail.com>2019-03-12 19:50:51 +0000
commitd0e94d5f1baac7a19d6cdd33b1f54470041e7227 (patch)
tree4acbcb48fb4aebb016129d2d72d9f3e7b7ec1747 /lib/pleroma/web/mastodon_api/websocket_handler.ex
parentc231ed610a8ebf95d9fb0a4bfa9e557ebf050a92 (diff)
parent25eb6cf1cbbfe78618f13a7218238a69807a051c (diff)
downloadpleroma-d0e94d5f1baac7a19d6cdd33b1f54470041e7227.tar.gz
Merge branch 'feature/add-roles-to-users-admin-api' into 'develop'
Add "roles" to users admin API See merge request pleroma/pleroma!928
Diffstat (limited to 'lib/pleroma/web/mastodon_api/websocket_handler.ex')
0 files changed, 0 insertions, 0 deletions