Merge branch 'feat/client_app_details' into 'develop'

author lain <lain@soykaf.club>

Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)

committer lain <lain@soykaf.club>

Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)
author lain <lain@soykaf.club>
Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)
committer lain <lain@soykaf.club>
Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)
committer	lain <lain@soykaf.club>
	Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history