diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-10-13 09:54:29 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-10-13 09:54:29 -0500 |
commit | 409f694e4f90d34285b43c7e7afc594bc386d893 (patch) | |
tree | 70d3283bcc7e565ba37b253c7cd7dbb94b9d9aa3 /config/test.exs | |
parent | 9968b7efedc64d0239db5578de7fc66ff4ce894d (diff) | |
parent | 8b6221d4ecd1d7e354e7de831dd46e285cb85077 (diff) | |
download | pleroma-409f694e4f90d34285b43c7e7afc594bc386d893.tar.gz pleroma-409f694e4f90d34285b43c7e7afc594bc386d893.zip |
Merge branch 'develop' into refactor/locked_user_field
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 95f860f2f..7cc660e3c 100644 --- a/config/test.exs +++ b/config/test.exs @@ -113,7 +113,7 @@ config :pleroma, Pleroma.Gun, Pleroma.GunMock config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true -config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false +config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true |