# Conflicts: # packages/frontend/src/pages/about.emojis.vue # packages/frontend/src/pages/custom-emojis-manager.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-js | ||
| shared | ||
| sw | ||
| meta.json | ||
# Conflicts: # packages/frontend/src/pages/about.emojis.vue # packages/frontend/src/pages/custom-emojis-manager.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-js | ||
| shared | ||
| sw | ||
| meta.json | ||