summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-09-08 18:35:07 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-10-13 16:44:03 +0300
commit7f5dbb020188eebfbfdf4860bbce4f1a8d66e06f (patch)
tree3342940ecd648fb773a6828fb67deee4a507d5a5
parentb081080dd9a138dccf5c3b8417913f975fdb8b52 (diff)
changes after rebase
-rw-r--r--lib/pleroma/tesla/middleware/connection_pool.ex (renamed from lib/pleroma/http/middleware/connection_pool.ex)0
-rw-r--r--test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs (renamed from test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs)0
2 files changed, 0 insertions, 0 deletions
diff --git a/lib/pleroma/http/middleware/connection_pool.ex b/lib/pleroma/tesla/middleware/connection_pool.ex
index 056e736ce..056e736ce 100644
--- a/lib/pleroma/http/middleware/connection_pool.ex
+++ b/lib/pleroma/tesla/middleware/connection_pool.ex
diff --git a/test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs b/test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs
index 86dd9ddae..86dd9ddae 100644
--- a/test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs