hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/thread-muting

Browse source
This commit is contained in:
Karen Konou 2019-02-11 12:10:10 +01:00
commit ac72b578da
457 changed files with 1123 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/web/mastodon_api/mastodon_api_controller_test.exs
View file

@ -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"})