Michael Telatynski 12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent		2020-02-13 16:36:05 +00:00
..
structures	Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere	2020-02-11 15:16:47 +00:00
views	Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent	2020-02-13 16:36:05 +00:00