minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md		2020-10-27 18:59:19 +00:00
..
activity_pub	Merge branch '2242-nsfw-case' into 'develop'	2020-10-23 19:39:42 +00:00
admin_api	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
api_spec
auth
common_api	Add local-only statuses	2020-10-15 18:37:44 +04:00
endpoint	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.	2020-10-18 21:22:21 +03:00
fed_sockets	Fix warnings	2020-10-15 16:54:59 +04:00
feed	other files consistency	2020-10-13 16:38:19 +03:00
mastodon_api	Merge branch 'develop' into 'feature/local-only-scope'	2020-10-27 18:59:19 +00:00
media_proxy
metadata	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
o_auth	Fix warnings	2020-10-15 16:54:59 +04:00
o_status
pleroma_api	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	2020-10-17 17:53:47 +03: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 'develop' into 'feature/local-only-scope'	2020-10-27 18:59:19 +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