diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:10 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:49 +0100 |
| commit | ac72b578da673282b927b945bfe03cd3012444b6 (patch) | |
| tree | 45b8c075aa883ca47fd24f3e71f6740bd2f2308b /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | c01ef574c192488c2643a20b4064439757613449 (diff) | |
| parent | 48552b38b2dd26bb832e940a0e52c0e1c2165b31 (diff) | |
| download | pleroma-ac72b578da673282b927b945bfe03cd3012444b6.tar.gz pleroma-ac72b578da673282b927b945bfe03cd3012444b6.zip | |
Merge branch 'develop' into feature/thread-muting
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index f7c059663..1a60ad8e6 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1752,7 +1752,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do describe "conversation muting" do setup do - user = insert(:user) {:ok, activity} = CommonAPI.post(user, %{"status" => "HIE"}) |