[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Mon, 8 Apr 2019 09:20:26 +0000 (12:20 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Mon, 8 Apr 2019 09:20:26 +0000 (12:20 +0300)
commitbffddf5e31c53d0603de387c61b6011f70785b97
tree97f07fb95346b603307534a34d0ecee5c9b70af1
parente3328bc1382315c9067c099995a29db70d9d0433
parentb177e1e7f330ff1531be190949db7f75e378a449
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# docs/config.md
# test/support/factory.ex
config/config.exs
docs/config.md
lib/pleroma/web/endpoint.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/support/factory.ex
test/web/oauth/oauth_controller_test.exs