[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 10:50:12 +0000 (13:50 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 10:50:12 +0000 (13:50 +0300)
commit590c935d95f0ea4fb65994027a88a0623527af88
tree6b459dd8bc0fdb8c095e8f0088cb44d263f2e8d9
parent804173fc924ec591558b8ed7671e35b506be9345
parent9305e241cbbf78c634576dec58fb383563b39c58
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# mix.exs
config/config.exs
lib/pleroma/web/router.ex