Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex		2020-09-11 17:19:58 +03:00
..
activity_expiration_policy_test.exs
anti_followbot_policy_test.exs
anti_link_spam_policy_test.exs
ensure_re_prepended_test.exs
force_bot_unlisted_policy_test.exs
hellthread_policy_test.exs
keyword_policy_test.exs
mediaproxy_warming_policy_test.exs
mention_policy_test.exs
mrf_test.exs
no_placeholder_text_policy_test.exs
normalize_markup_test.exs
object_age_policy_test.exs
reject_non_public_test.exs
simple_policy_test.exs
steal_emoji_policy_test.exs
subchain_policy_test.exs
tag_policy_test.exs
user_allowlist_policy_test.exs
vocabulary_policy_test.exs