Michael Telatynski 201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types ... # Conflicts: # test/components/structures/MessagePanel-test.js		2019-07-31 12:21:00 +01:00
..
structures	Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types	2019-07-31 12:21:00 +01:00
views	Finally fix tests	2019-07-11 15:01:56 -06:00
stub-component.js	Run eslint --fix	2017-10-11 17:56:17 +01:00