diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-09 07:09:39 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-09 07:09:39 +0000 |
| commit | 5c5c8508c203886f32b150e7d8c1f7362a4fde0e (patch) | |
| tree | 7853b2520be94252a722c694a1d0c5622f444493 /lib/pleroma/user | |
| parent | 3aee8bb67bd3f78ad4e638ea056bbd7b3ff4b7e7 (diff) | |
| parent | 567651fb3fcacbe5bb2f9c19deb9655edaaad076 (diff) | |
| download | pleroma-5c5c8508c203886f32b150e7d8c1f7362a4fde0e.tar.gz | |
Merge branch 'hotfix/media-proxy-uri' into 'develop'
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
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 2f419a5a2..7c79dfcff 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -41,8 +41,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} |