Michael Telatynski e2a109667a Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/5.1 ... Conflicts: src/vector/platform/ElectronPlatform.tsx		2021-06-23 14:54:06 +01:00
..
@types	Fix Electron type merging	2021-02-08 15:12:31 +00:00
async-components/structures	Appease the linter	2021-04-08 18:43:57 -06:00
components	Convert Vector skin react components to Typescript	2021-04-26 09:49:21 +01:00
customisations	…
i18n/strings	Merge pull request #17457 from vector-im/t3chguy/fix/17128-1	2021-06-22 14:21:46 +01:00
vector	Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/5.1	2021-06-23 14:54:06 +01:00
favicon.ts	…
header	…