Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

author lain <lain@soykaf.club>

Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)

committer lain <lain@soykaf.club>

Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
author lain <lain@soykaf.club>
Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
committer lain <lain@soykaf.club>
Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc CHANGELOG.md
Simple merge
author	lain <lain@soykaf.club>
	Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
committer	lain <lain@soykaf.club>
	Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history