[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 14 Sep 2019 13:11:44 +0000 (16:11 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 14 Sep 2019 13:11:44 +0000 (16:11 +0300)
commit6bcedb693c47fcef44ff3b4412629d1c50c2a1c7
tree0420581ba993b70cb957c261cb83ef90597ddeb4
parentc3f00447afc67b460e63b531e4f2432bfaa37bdb
parenta9b78f55e3561eec3cd125f030d2dd6ec338d406
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# docs/config.md
# mix.lock
19 files changed:
CHANGELOG.md
config/config.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
mix.exs
mix.lock
test/activity_test.exs
test/user_test.exs
test/web/activity_pub/activity_pub_controller_test.exs
test/web/activity_pub/publisher_test.exs
test/web/activity_pub/relay_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/util_controller_test.exs