hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts

Browse source 
# Conflicts:
#	docs/config.md
This commit is contained in:
Egor Kislitsyn 2019-01-09 16:56:31 +07:00
commit 48591aab98
5 changed files with 137 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/user/info.ex
View file

@ -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}