Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs		2019-08-22 20:59:58 +03:00
..
anti_followbot_policy_test.exs
anti_link_spam_policy_test.exs
ensure_re_prepended_test.exs
hellthread_policy_test.exs
keyword_policy_test.exs
mediaproxy_warming_policy_test.exs
mention_policy_test.exs
mrf_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
no_placeholder_text_policy_test.exs
normalize_markup_test.exs
reject_non_public_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
simple_policy_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
subchain_policy_test.exs
tag_policy_test.exs
user_allowlist_policy_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
vocabulary_policy_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00