Skip to content
Snippets Groups Projects
Commit 2a96283e authored by Ivan Tashkinov's avatar Ivan Tashkinov
Browse files

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
parents 27390574 1344e34e
No related branches found
No related tags found
Loading
Showing
with 388 additions and 29 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment