Commit Graph

155 Commits (59258585b38c7cf748184a19655f044d685b0c70)

Author SHA1 Message Date
Travis Ralston dc44b9ef59 Store and thread 3pid invite through the app
This doesn't do anything with the stored value (yet), but enables us to do something with it in a future commit.
2020-09-11 19:49:48 -06:00
Michael Telatynski a1f1334250 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3
 Conflicts:
	src/components/structures/RoomView.tsx
2020-09-09 15:16:19 +01:00
Michael Telatynski 9d85d0436c iterate PR 2020-09-08 15:22:23 +01:00
Michael Telatynski 3bc42d7470 delint 2020-09-08 11:05:33 +01:00
Michael Telatynski 906d4defd5 Convert RoomView and RoomContext to TS 2020-09-08 10:52:37 +01:00