[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 6 Sep 2019 10:26:05 +0000 (13:26 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 6 Sep 2019 10:26:05 +0000 (13:26 +0300)
commitca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e
tree7a9d31d44f362ff903813925171a4c31942b8261
parent79cf629e1a3610a93f5b9349c18a4464eb859d3d
parent896ffabe37406e85c2a3c2f30d2e882c68b5831e
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
CHANGELOG.md
lib/pleroma/user.ex
test/notification_test.exs
test/user_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs