Michael Telatynski 89221bde0f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 ... Conflicts: src/dispatcher/actions.ts		2021-06-15 13:58:13 +01:00
..
payloads	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1	2021-06-15 13:58:13 +01:00
actions.ts	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1	2021-06-15 13:58:13 +01:00
dispatcher.ts	Convert view_user dispatch to prove the conversion works	2020-05-13 21:07:50 -06:00
payloads.ts	Break out actions and payloads to their own files	2020-05-13 21:07:50 -06:00