kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' ... Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703		2019-09-23 22:35:09 +00:00
..
controllers	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'	2019-09-23 22:35:09 +00:00
views	Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)	2019-09-17 14:45:47 +03:00
mastodon_api.ex	tests for /web/mastodon_api/mastodon_api.ex	2019-08-13 21:12:37 +00:00
websocket_handler.ex	Revert "Merge branch 'revert-4fabf83a' into 'develop'"	2019-09-16 17:55:04 +07:00