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

Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

Browse source
This commit is contained in:
Ivan Tashkinov 2019-03-15 17:11:00 +03:00
commit 2739057442
143 changed files with 1123 additions and 500 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