Merge branch 'main' into fix/fix-badges-spacing-componentize

author SleeplessOne1917 <abias1122@gmail.com>

Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)

committer GitHub <noreply@github.com>

Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)
author SleeplessOne1917 <abias1122@gmail.com>
Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)
committer GitHub <noreply@github.com>
Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)
diff --cc src/shared/components/person/profile.tsx
Simple merge
diff --cc src/shared/components/post/post-listing.tsx
Simple merge
author	SleeplessOne1917 <abias1122@gmail.com>
	Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)
committer	GitHub <noreply@github.com>
	Mon, 3 Jul 2023 12:29:55 +0000 (12:29 +0000)
		1	2
src/shared/components/person/profile.tsx	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/components/post/post-listing.tsx	patch \|	diff1 \|	diff2 \|	blob \| history