Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export		2020-10-14 15:27:15 -05:00
..
activity_pub	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
admin_api	Merge branch 'develop' into feature/account-export	2020-10-14 15:27:15 -05:00
api_spec
auth
common_api
fed_sockets
feed
mastodon_api	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
media_proxy
metadata
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
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
mongoose_im_controller_test.exs
node_info_test.exs
rel_me_test.exs
streamer_test.exs
uploader_controller_test.exs
web_finger_test.exs