Merge branch 'jellyfin:master' into master

jellyfin · Oct 29, 2023 · 15c7e24 · 15c7e24
2 parents bf21266 + 2b67afd
commit 15c7e24
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 270 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,8 +8,7 @@
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
-    "plugin:jsx-a11y/recommended",
-    "plugin:prettier/recommended"
+    "plugin:jsx-a11y/recommended"
   ],
   "globals": {
     "JSX": "readonly"