aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/admin_api_controller.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-03 21:10:10 +0000
committerkaniini <nenolod@gmail.com>2019-03-03 21:10:10 +0000
commitdd5865535eb16f535ff996eb3dec5e947a905268 (patch)
tree6543397b1d1f12662302128d4f4e8104ae2a9957 /lib/pleroma/web/admin_api/admin_api_controller.ex
parent8543e7f7608207a7b72987141e9d11263ad52a72 (diff)
parent818a7894da13c10961a411bd2876f74e74494495 (diff)
downloadpleroma-dd5865535eb16f535ff996eb3dec5e947a905268.tar.gz
Merge branch 'muting' into 'develop'
Don't stream muted accounts See merge request pleroma/pleroma!888
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
0 files changed, 0 insertions, 0 deletions