Conflicts: package.json src/@types/global.d.ts src/vector/app.tsx src/vector/jitsi/index.ts src/vector/platform/WebPlatform.ts yarn.lock |
||
|---|---|---|
| .. | ||
| @types | ||
| async-components/structures | ||
| components | ||
| customisations | ||
| i18n/strings | ||
| vector | ||
| favicon.ts | ||
| header | ||
Conflicts: package.json src/@types/global.d.ts src/vector/app.tsx src/vector/jitsi/index.ts src/vector/platform/WebPlatform.ts yarn.lock |
||
|---|---|---|
| .. | ||
| @types | ||
| async-components/structures | ||
| components | ||
| customisations | ||
| i18n/strings | ||
| vector | ||
| favicon.ts | ||
| header | ||