Michael Telatynski 876acc0f76 Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history ...

# Conflicts:
#	src/components/views/rooms/MessageComposerInput.js

2019-06-14 12:26:05 +01:00

..

structures

Merge pull request #3101 from matrix-org/dbkr/simplify_email_reg

2019-06-13 18:22:30 +01:00

views

Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history

2019-06-14 12:26:05 +01:00