# Conflicts: # CHANGELOG.md # locales/index.d.ts # locales/ja-JP.yml # packages/frontend/.storybook/generate.tsx |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-bubble-game | ||
| misskey-js | ||
| misskey-reversi | ||
| shared | ||
| sw | ||
| meta.json | ||
# Conflicts: # CHANGELOG.md # locales/index.d.ts # locales/ja-JP.yml # packages/frontend/.storybook/generate.tsx |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-bubble-game | ||
| misskey-js | ||
| misskey-reversi | ||
| shared | ||
| sw | ||
| meta.json | ||