[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 15 Sep 2019 07:12:24 +0000 (10:12 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 15 Sep 2019 07:12:24 +0000 (10:12 +0300)
commit610236d6be1916783976f502255835b411337d79
tree16f79d48ab22ab6faabfd8917126716ce261db1e
parente127b9ab6d01da48ebad188d2b9fcf7cb8a41578
parent9c64a25713790fefa8b5c419aeadf55113c17073
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# docs/config.md
CHANGELOG.md
lib/pleroma/user.ex
mix.exs
test/activity_test.exs
test/user_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs