Merge branch '1031-parent-visible' into 'develop'

author lain <lain@soykaf.club>

Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)

committer lain <lain@soykaf.club>

Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)
author lain <lain@soykaf.club>
Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)
committer lain <lain@soykaf.club>
Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc docs/API/differences_in_mastoapi_responses.md
Simple merge
author	lain <lain@soykaf.club>
	Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)
committer	lain <lain@soykaf.club>
	Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/API/differences_in_mastoapi_responses.md	patch \|	diff1 \|	diff2 \|	blob \| history