mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
b03b4582c0
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 |