Merge branch 'benchmark-finishing' into 'develop'

author lain <lain@soykaf.club>

Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)

committer lain <lain@soykaf.club>

Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)
author lain <lain@soykaf.club>
Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)
committer lain <lain@soykaf.club>
Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc mix.exs
Simple merge
author	lain <lain@soykaf.club>
	Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)
committer	lain <lain@soykaf.club>
	Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
mix.exs	patch \|	diff1 \|	diff2 \|	blob \| history