From: Anon <makotech222@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:59:21 +0000 (-0500)
Subject: Merge branch 'main' into custom-emojis
X-Git-Url: http://these/git/%7B%60/css/themes/static/%7Bs.link%7D?a=commitdiff_plain;h=4b6851d246dd2c7cc173cda4d5813f0c64a0ea13;p=lemmy-ui.git

Merge branch 'main' into custom-emojis
---

4b6851d246dd2c7cc173cda4d5813f0c64a0ea13
diff --cc package.json
index 87f23d0,26f10e9..fba9403
--- a/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",