diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
commit | bc4f77b10bb4360ac00d1999b1d08fa55e1fa547 (patch) | |
tree | 8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485 /lib/pleroma/PasswordResetToken.ex | |
parent | dcf24a3233bb50689d26f9d7833f98158730ce35 (diff) | |
parent | 3b141194715e362d65482672d00b10991d102fa2 (diff) | |
download | pleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.tar.gz |
[#468] Merged `upstream/develop`, resolved conflicts.
Diffstat (limited to 'lib/pleroma/PasswordResetToken.ex')
-rw-r--r-- | lib/pleroma/PasswordResetToken.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/PasswordResetToken.ex b/lib/pleroma/PasswordResetToken.ex index c3c0384d2..750ddd3c0 100644 --- a/lib/pleroma/PasswordResetToken.ex +++ b/lib/pleroma/PasswordResetToken.ex @@ -7,7 +7,9 @@ defmodule Pleroma.PasswordResetToken do import Ecto.Changeset - alias Pleroma.{User, PasswordResetToken, Repo} + alias Pleroma.User + alias Pleroma.Repo + alias Pleroma.PasswordResetToken schema "password_reset_tokens" do belongs_to(:user, User, type: Pleroma.FlakeId) |