Skip to content
GitLab
Explore
Sign in
Register
Pleroma
pleroma
Repository
pleroma
lib
pleroma
user.ex
Find file
Blame
History
Permalink
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
· 2a96283e
Ivan Tashkinov
authored
Mar 18, 2019
# Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
2a96283e