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

 Conflicts:

	src/components/views/rooms/MessageComposer.js

2020-05-29 14:53:42 +01:00

..

structures

Try and fix the Notifier race

2020-05-28 19:03:42 +01:00

views

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

2020-05-29 14:53:42 +01:00