Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...

author lain <lain@soykaf.club>

Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)

committer lain <lain@soykaf.club>

Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
author lain <lain@soykaf.club>
Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
committer lain <lain@soykaf.club>
Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
author	lain <lain@soykaf.club>
	Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
committer	lain <lain@soykaf.club>
	Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration/cheatsheet.md	patch \|	diff1 \|	diff2 \|	blob \| history