element-web/src/vector/jitsi
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
..
index.html re-todo 2020-09-29 11:04:08 -06:00
index.scss Rebrand some GitHub links 2020-11-25 14:16:55 +00:00
index.ts Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/querystring 2021-07-16 12:45:37 +01:00