Conflicts: package.json src/@types/global.d.ts src/vector/app.tsx src/vector/jitsi/index.ts src/vector/platform/WebPlatform.ts yarn.lock |
||
|---|---|---|
| .. | ||
| app-tests | ||
| unit-tests | ||
| .eslintrc.js | ||
| jest-mocks.js | ||
| skin-sdk.js | ||
| test-utils.js | ||
Conflicts: package.json src/@types/global.d.ts src/vector/app.tsx src/vector/jitsi/index.ts src/vector/platform/WebPlatform.ts yarn.lock |
||
|---|---|---|
| .. | ||
| app-tests | ||
| unit-tests | ||
| .eslintrc.js | ||
| jest-mocks.js | ||
| skin-sdk.js | ||
| test-utils.js | ||