diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-17 16:59:05 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-17 16:59:05 +0700 |
| commit | 2f0203a4a1c7a507aa5cf50be2fd372536ebfc81 (patch) | |
| tree | 8219ebfbfffb47ffff5649dfe428c501a4ccb089 /lib | |
| parent | 87013f843853250e8b15696900e09afb92d22aac (diff) | |
| download | pleroma-2f0203a4a1c7a507aa5cf50be2fd372536ebfc81.tar.gz pleroma-2f0203a4a1c7a507aa5cf50be2fd372536ebfc81.zip | |
Resolve conflicts
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 78eb29ddd..0982f6ed8 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -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) |