[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Mon, 1 Apr 2019 05:49:32 +0000 (08:49 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Mon, 1 Apr 2019 05:49:32 +0000 (08:49 +0300)
commitbaffdcc480cea13269ef0e3af58f0a848892bb9a
treea9499083c412b24173fa14717cec7041c6f3f45c
parent642075b1a935c42181a10ea695b2289883126136
parentdc39d8d3fb941bad9fe26586c321bb00a0b92fe4
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

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