Michael Telatynski b03b4582c0 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/querystring ... Conflicts: package.json src/@types/global.d.ts src/vector/app.tsx src/vector/jitsi/index.ts src/vector/platform/WebPlatform.ts yarn.lock		2021-07-16 12:45:37 +01:00
..
app-tests	Fix loading-test for SSO plaf changes	2020-06-25 23:59:08 +01:00
unit-tests	Use URLSearchParams instead of transitive dependency querystring	2020-04-12 01:45:58 +01:00
.eslintrc.js	Add eslint config	2017-01-23 14:22:54 +00:00
jest-mocks.js	Swap over to Jest, breaking everything	2020-01-15 13:24:19 -07:00
skin-sdk.js	Fix CI tests	2020-01-13 20:40:00 -07:00
test-utils.js	Replace beforeEach with just a cleanLocalstorage call	2020-01-15 14:06:24 -07:00