Merge remote-tracking branch 'origin/develop' into benchmark-finishing

author lain <lain@soykaf.club>

Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)

committer lain <lain@soykaf.club>

Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)
author lain <lain@soykaf.club>
Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)
committer lain <lain@soykaf.club>
Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc lib/pleroma/user.ex
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>
	Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)
committer	lain <lain@soykaf.club>
	Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	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