diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
| commit | 0f2f7d2cec8297b1b5645643d7584cde561ce628 (patch) | |
| tree | aa618de9dc399de2e3abf37ad9ecf66d8cb9761f /test/integration/mastodon_websocket_test.exs | |
| parent | 22ac2288be498bd6a5a6fefe2dc6d2e260a8dc39 (diff) | |
| parent | e5d553aa45ffa218b0695d7976f012bfc1dcbafe (diff) | |
| download | pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.tar.gz pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
| -rw-r--r-- | test/integration/mastodon_websocket_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs index 0c513b6e7..b42c9ef07 100644 --- a/test/integration/mastodon_websocket_test.exs +++ b/test/integration/mastodon_websocket_test.exs @@ -7,9 +7,9 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do import Pleroma.Factory + alias Pleroma.Integration.WebsocketClient alias Pleroma.Web.CommonAPI alias Pleroma.Web.OAuth - alias Pleroma.Integration.WebsocketClient alias Pleroma.Web.Streamer @path Pleroma.Web.Endpoint.url() |