diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
commit | ba50dc05a8d655deece0aa619aebe1e25dc9d4eb (patch) | |
tree | 4fd9c8ccc64de7b7ab1be6dd0659d34a6daa87d9 /test/support/channel_case.ex | |
parent | d54233760f4c006d89aa80e0ae78cb6910fc74ab (diff) | |
parent | 342c2e1bc0055b71a9772ef031eab3e8bc88d29b (diff) | |
download | pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.tar.gz pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.zip |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/support/channel_case.ex')
-rw-r--r-- | test/support/channel_case.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/support/channel_case.ex b/test/support/channel_case.ex index d63a0f06b..114184a9f 100644 --- a/test/support/channel_case.ex +++ b/test/support/channel_case.ex @@ -22,7 +22,7 @@ defmodule Pleroma.Web.ChannelCase do using do quote do # Import conveniences for testing with channels - use Phoenix.ChannelTest + import Phoenix.ChannelTest use Pleroma.Tests.Helpers # The default endpoint for testing |