Merge branch 'main' into nicer-error-hnadling

diff --cc package.json
index 0315416027d1af803bd2bd8fdc3ccdb315d5cdb3,2f16b8d3797fc72970f25074a864492d7645fc61..8ad258d8cb3a3c0890ed5bcc5e09b31d53d4a4bb
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -60,8 -60,7 +60,8 @@@
      "inferno-server": "^8.1.1",
      "isomorphic-cookie": "^1.2.4",
      "jwt-decode": "^3.1.2",
-     "lemmy-js-client": "0.17.2-rc.15",
+     "lemmy-js-client": "0.17.2-rc.17",
 +    "lodash": "^4.17.21",
      "markdown-it": "^13.0.1",
      "markdown-it-container": "^3.0.0",
      "markdown-it-emoji": "^2.0.2",

diff --cc src/shared/components/app/navbar.tsx
Simple merge

diff --cc src/shared/components/person/inbox.tsx
Simple merge

diff --cc src/shared/components/person/registration-applications.tsx
Simple merge

diff --cc src/shared/components/person/reports.tsx
Simple merge

diff --cc src/shared/utils.ts
Simple merge

diff --cc yarn.lock
Simple merge