Haelwenn 0495a07dc7 Merge branch '2239-mute-fixes' into 'develop' ... ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084		2020-10-19 04:26:35 +00:00
..
activity_pub	ActivityPub: Show own replies to muted users.	2020-10-15 12:28:25 +02:00
admin_api	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
api_spec
auth
common_api
fed_sockets	changes after rebase	2020-10-13 16:44:03 +03:00
feed	other files consistency	2020-10-13 16:38:19 +03:00
mastodon_api	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
media_proxy
metadata	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
o_auth
o_status
pleroma_api	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
plugs	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
preload/providers	update files consistency after rebase	2020-10-13 16:44:00 +03:00
push	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
rich_media	changes after rebase	2020-10-13 17:10:34 +03:00
static_fe
twitter_api
views
web_finger
chat_channel_test.exs
common_api_test.exs	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
fallback_test.exs
federator_test.exs
media_proxy_test.exs
metadata_test.exs	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
mongoose_im_controller_test.exs
node_info_test.exs
rel_me_test.exs
streamer_test.exs
uploader_controller_test.exs
web_finger_test.exs