Merge branch 'main' into feat/vote-components

author Jay Sitter <jsit@users.noreply.github.com>

Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)

committer GitHub <noreply@github.com>

Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)
author Jay Sitter <jsit@users.noreply.github.com>
Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)
committer GitHub <noreply@github.com>
Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)
diff --cc src/shared/components/comment/comment-node.tsx
Simple merge
author	Jay Sitter <jsit@users.noreply.github.com>
	Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)
committer	GitHub <noreply@github.com>
	Sat, 24 Jun 2023 19:00:52 +0000 (15:00 -0400)