Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Mon, 7 Oct 2019 11:40:31 +0000 (11:40 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 7 Oct 2019 11:40:31 +0000 (11:40 +0000)
commit079d069eb43804ffc87f2bb53426d4c8dc34b111
tree2e7753bc6785ea1585b927c915844a121d0c3202
parentcb36fe0128c2da9480e543ae5d71768bd73af239
parent790ae8e18963487f6e63fbd12407acd9a0ef1c76
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'

backport: Mastodon API: Fix private and direct statuses not being filtered out from the...

See merge request pleroma/pleroma!1807