matrix-react-sdk

fe121126 - Merge branch 'develop' into rte-fixes

Merge branch 'develop' into rte-fixes Conflicts: src/UserSettingsStore.js src/autocomplete/EmojiProvider.js src/components/views/rooms/MessageComposerInput.js