Merge branch 'main' into custom-emojis

diff --cc package.json
index 87f23d08442820667c6a0e004c91bcec795cbbe2,26f10e9c71a1b2559aa5a56687a52c6871fe415d..fba9403573cced26f278381511509c0570221b14
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -47,10 -45,9 +47,10 @@@
      "inferno-server": "^8.0.6",
      "isomorphic-cookie": "^1.2.4",
      "jwt-decode": "^3.1.2",
-     "lemmy-js-client": "0.17.2-rc.1",
+     "lemmy-js-client": "0.17.2-rc.3",
      "markdown-it": "^13.0.1",
      "markdown-it-container": "^3.0.0",
 +    "markdown-it-emoji": "^2.0.2",
      "markdown-it-footnote": "^3.0.3",
      "markdown-it-html5-embed": "^1.0.0",
      "markdown-it-sub": "^1.0.0",

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

diff --cc yarn.lock
Simple merge