aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-12-04 19:41:14 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-12-04 19:41:14 +0300
commitd3bce89edddf72e2eb78e7c84a93c5bd4b6c8ff8 (patch)
treec86b720b82182e381f3efa1945181294e6648913 /lib/pleroma
parent30caf3e51e32830153e693727b3765e8817171a3 (diff)
downloadpleroma-d3bce89edddf72e2eb78e7c84a93c5bd4b6c8ff8.tar.gz
[#1335] Merge issue fix.
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/user.ex2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a68524377..b7f50e5ac 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -169,8 +169,6 @@ defmodule Pleroma.User do
has_many(incoming_relation_source, through: [incoming_relation, :source])
end
- field(:info, :map, default: %{})
-
# `:blocks` is deprecated (replaced with `blocked_users` relation)
field(:blocks, {:array, :string}, default: [])
# `:mutes` is deprecated (replaced with `muted_users` relation)