pleroma/test/web
Ilja 0411bdc748 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies
Conflicts:
	lib/pleroma/config/deprecation_warnings.ex

It looks like `:ok <- mrf_user_allowlist(),` was removed and this created conflicts
2020-09-25 23:47:08 +02:00
..
activity_pub Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies 2020-09-25 23:47:08 +02:00
admin_api
api_spec
auth
common_api
fed_sockets
feed
instances
mastodon_api
media_proxy
metadata
mongooseim
oauth
ostatus
pleroma_api
plugs
preload
push
rich_media
static_fe
streamer
twitter_api
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs