Merge branch 'main' into rate-limiting-tab

author abias <abias1122@gmail.com>

Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)

committer abias <abias1122@gmail.com>

Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)
author abias <abias1122@gmail.com>
Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)
committer abias <abias1122@gmail.com>
Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)
diff --cc src/shared/components/person/settings.tsx
Simple merge
author	abias <abias1122@gmail.com>
	Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)
committer	abias <abias1122@gmail.com>
	Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)