aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-11-14 19:48:47 -0600
committerAlex Gleason <alex@alexgleason.me>2020-11-14 19:48:47 -0600
commit9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (patch)
treecc6b9add45f34878b1ce053b6a408e059768fa6a /test/pleroma/web/twitter_api
parentdc38dc847207e4724265fbeb111d0a236b75f93f (diff)
parent28da36975dc325bb577ee81fb791fbdc7ec3e7e2 (diff)
downloadpleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.tar.gz
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'test/pleroma/web/twitter_api')
-rw-r--r--test/pleroma/web/twitter_api/remote_follow_controller_test.exs1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
index 3852c7ce9..a3e784d13 100644
--- a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
+++ b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
@@ -5,7 +5,6 @@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
use Pleroma.Web.ConnCase
- alias Pleroma.Config
alias Pleroma.MFA
alias Pleroma.MFA.TOTP
alias Pleroma.User