Merge branch 'issue/1509' into 'develop'

author lain <lain@soykaf.club>

Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)

committer lain <lain@soykaf.club>

Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)
author lain <lain@soykaf.club>
Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)
committer lain <lain@soykaf.club>
Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)
diff --cc config/config.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
diff --cc lib/pleroma/object.ex
Simple merge
author	lain <lain@soykaf.club>
	Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)
committer	lain <lain@soykaf.club>
	Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration/cheatsheet.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/object.ex	patch \|	diff1 \|	diff2 \|	blob \| history