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

Merge remote-tracking branch 'upstream/develop' into feature/openldap-support

Browse source
This commit is contained in:
link0ff 2019-03-14 17:43:30 +02:00
commit 54e7087ab4
509 changed files with 2697 additions and 1303 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/auth/pleroma_authenticator.ex
View file

@ -3,8 +3,8 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
alias Pleroma.User
alias Comeonin.Pbkdf2
alias Pleroma.User
@behaviour Pleroma.Web.Auth.Authenticator