Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Fri, 15 Mar 2019 14:11:00 +0000 (17:11 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Fri, 15 Mar 2019 14:11:00 +0000 (17:11 +0300)
commit273905744242b013ba9736ff7e1415a0499022d1
tree146f5ad5428130dce0076ea9f6398035d7ac88f6
parentaacbf0f57053786533df045125dee93ace0daa93
parent41fc67aa4993c119dae82578df7309d3999ac47a
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/auth/pleroma_authenticator.ex
lib/pleroma/web/endpoint.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex