# Conflicts: # CHANGELOG.md # packages/frontend/src/components/MkModal.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-bubble-game | ||
| misskey-js | ||
| misskey-reversi | ||
| shared | ||
| sw | ||
| meta.json | ||
# Conflicts: # CHANGELOG.md # packages/frontend/src/components/MkModal.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-bubble-game | ||
| misskey-js | ||
| misskey-reversi | ||
| shared | ||
| sw | ||
| meta.json | ||