From: abias <abias1122@gmail.com>
Date: Tue, 16 May 2023 00:34:45 +0000 (-0400)
Subject: Merge branch 'main' into nicer-error-hnadling
X-Git-Url: http://these/git/%7B%60/feeds/%7B%60%24%7BarchiveUrl%7D/?a=commitdiff_plain;h=5068df6bf515ba192383e6241f88a8755f4a38ef;p=lemmy-ui.git

Merge branch 'main' into nicer-error-hnadling
---

5068df6bf515ba192383e6241f88a8755f4a38ef
diff --cc package.json
index 0315416,2f16b8d..8ad258d
--- a/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",