Merge branch 'feature/jobs' into 'develop'

author kaniini <nenolod@gmail.com>

Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)

committer kaniini <nenolod@gmail.com>

Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)
author kaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)
committer kaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)
diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc test/web/federator_test.exs
Simple merge
author	kaniini <nenolod@gmail.com>
	Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)
committer	kaniini <nenolod@gmail.com>
	Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/utils.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/federator_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history