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.ex
anti_followbot_policy.ex
anti_link_spam_policy.ex
drop_policy.ex
ensure_re_prepended.ex
force_bot_unlisted_policy.ex
hellthread_policy.ex
keyword_policy.ex
media_proxy_warming_policy.ex
mention_policy.ex
no_op_policy.ex
no_placeholder_text_policy.ex
normalize_markup.ex
object_age_policy.ex
reject_non_public.ex
simple_policy.ex
steal_emoji_policy.ex
subchain_policy.ex
tag_policy.ex
user_allow_list_policy.ex
vocabulary_policy.ex