Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 11:05:34 +0000 (14:05 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 11:05:34 +0000 (14:05 +0300)
commit37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24
tree2e3f848e697426f4b79d8e02a2ba20df12368ca9
parent590c935d95f0ea4fb65994027a88a0623527af88
parent091baf93169895c62418ccee81b80d00416aaa56
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
lib/pleroma/user.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex