Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

2023-04-08 17:39:48 +09:00 · 2023-04-08 17:39:48 +09:00 · cc57fc041a
commit cc57fc041a
parent 90df0d87ae 95f670e3ec
4 changed files with 22 additions and 4 deletions
--- a/packages/backend/test/docker-compose.yml
+++ b/packages/backend/test/docker-compose.yml
@ -2,7 +2,7 @@ version: "3"

 services:
  redistest:
-    image: redis:6
+    image: redis:7
    ports:
      - "127.0.0.1:56312:6379"

--- a/packages/frontend/.storybook/preview-head.html
+++ b/packages/frontend/.storybook/preview-head.html
@ -1,4 +1,10 @@
 <link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@2.12.0/tabler-icons.min.css">
+<link rel="stylesheet" href="https://unpkg.com/@fontsource/m-plus-rounded-1c/index.css">
+<style>
+	html {
+		font-family: 'Hiragino Maru Gothic Pro', 'BIZ UDGothic', Roboto, HelveticaNeue, Arial, 'M PLUS Rounded 1c', sans-serif;
+	}
+</style>
 <script>
  window.global = window;
 </script>