Merge branch 'develop' into gun

2020-02-21 10:02:37 +03:00 · 2020-02-21 10:02:37 +03:00 · 13918cb545
commit 13918cb545
parent c9db0507f8 292031f6dd
56 changed files with 860 additions and 223 deletions
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@ -68,6 +68,7 @@ defmodule Pleroma.Web.CommonAPITest do
    har = insert(:user)
    jafnhar = insert(:user)
    tridi = insert(:user)
+
    Pleroma.Config.put([:instance, :safe_dm_mentions], true)

    {:ok, activity} =