diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
commit | 48591aab980d92823b51d2363fcd4b64d311739a (patch) | |
tree | 0bceebfbc8e96c7999683168b62b1e4f88272625 /lib/pleroma/user | |
parent | 0c750bc432a6329be7f0dc15707e46625b11faf3 (diff) | |
parent | 5c5c8508c203886f32b150e7d8c1f7362a4fde0e (diff) | |
download | pleroma-48591aab980d92823b51d2363fcd4b64d311739a.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
Diffstat (limited to 'lib/pleroma/user')
-rw-r--r-- | lib/pleroma/user/info.ex | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 8ac50540d..fb1791c20 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -42,8 +42,6 @@ defmodule Pleroma.User.Info do # subject _> Where is this used? end - def superuser?(info), do: info.is_admin || info.is_moderator - def set_activation_status(info, deactivated) do params = %{deactivated: deactivated} |