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

Resolve conflicts

Browse source
This commit is contained in:
Roman Chvanikov 2019-04-17 16:59:05 +07:00
commit 2f0203a4a1
5 changed files with 57 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/user.ex
View file

@ -55,6 +55,8 @@ defmodule Pleroma.User do
field(:tags, {:array, :string}, default: [])
field(:bookmarks, {:array, :string}, default: [])
field(:last_refreshed_at, :naive_datetime_usec)
field(:current_sign_in_at, :naive_datetime)
field(:last_digest_emailed_at, :naive_datetime)
has_many(:notifications, Notification)
has_many(:registrations, Registration)
embeds_one(:info, Pleroma.User.Info)