Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

author Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history