diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
| commit | 0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd (patch) | |
| tree | 0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1 /test/web/common_api | |
| parent | 343229465753ebcc59002a2dd604a910a8ce462d (diff) | |
| parent | e0b2de63853e9a14b72faddf6e1180a098728205 (diff) | |
| download | pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
Diffstat (limited to 'test/web/common_api')
| -rw-r--r-- | test/web/common_api/common_api_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 11f7c068f..601c32954 100644 --- 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} = |