diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 05:55:39 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 05:55:39 +0300 |
| commit | fb38b7339ccb6c3d7a3a07b74a6471a0f38622fe (patch) | |
| tree | a6dc7761d53a37be6a1c46af1c3cbc8873ce50d8 /lib/pleroma/user.ex | |
| parent | fe7a0d660e357a03558be3a95ddbb8b409ef9a9e (diff) | |
| parent | 7612d9403dbaa6741b28dcf427ecad8fd0f70c30 (diff) | |
| download | pleroma-fb38b7339ccb6c3d7a3a07b74a6471a0f38622fe.tar.gz | |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 99358ddaf..2c343eb22 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -113,7 +113,6 @@ defmodule Pleroma.User do field(:is_admin, :boolean, default: false) field(:show_role, :boolean, default: true) field(:settings, :map, default: nil) - field(:magic_key, :string, default: nil) field(:uri, Types.Uri, default: nil) field(:hide_followers_count, :boolean, default: false) field(:hide_follows_count, :boolean, default: false) @@ -387,7 +386,6 @@ defmodule Pleroma.User do :banner, :locked, :last_refreshed_at, - :magic_key, :uri, :follower_address, :following_address, |