Michael Telatynski f16011394e Merge branches 'develop' and 't3chguy/composer_demote' of github.com:matrix-org/matrix-react-sdk into t3chguy/composer_demote ... # Conflicts: # src/components/views/rooms/MessageComposer.js		2019-02-27 00:28:16 +00:00
..
structures	Merge pull request #2672 from jryans/password-validation	2019-02-26 18:20:38 +00:00
views	Merge branches 'develop' and 't3chguy/composer_demote' of github.com:matrix-org/matrix-react-sdk into t3chguy/composer_demote	2019-02-27 00:28:16 +00:00