[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Mon, 18 Mar 2019 07:26:41 +0000 (10:26 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Mon, 18 Mar 2019 07:26:41 +0000 (10:26 +0300)
commit2a96283efbd46c017cf9e15ef4fda3188e5e5bca
tree3265b9ff9f830a366d14870486c85ddcd08f51c9
parent273905744242b013ba9736ff7e1415a0499022d1
parent1344e34ed3a337b54e450af474f81e2f326bf768
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/auth/ldap_authenticator.ex
lib/pleroma/web/auth/pleroma_authenticator.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex
mix.exs