diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 | 
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 | 
| commit | bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1 (patch) | |
| tree | 307120b8958a5be8dad4a16e6e2ff779336a30e3 /test/formatter_test.exs | |
| parent | f7e623c11c4b6f4f323a4317e9489092be73f9cd (diff) | |
| parent | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (diff) | |
| download | pleroma-bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1.tar.gz pleroma-bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1.zip  | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
#	CHANGELOG.md
Diffstat (limited to 'test/formatter_test.exs')
| -rw-r--r-- | test/formatter_test.exs | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 93fd8eab7..bef5a2c28 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -140,7 +140,7 @@ defmodule Pleroma.FormatterTest do        archaeme =          insert(:user,            nickname: "archa_eme_", -          source_data: %{"url" => "https://archeme/@archa_eme_"} +          uri: "https://archeme/@archa_eme_"          )        archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})  | 
