Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Rewire the Sticker button to be an Emoji Picker to release #4684

Merged
merged 6 commits into from
Jun 2, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jun 2, 2020

#3747 to RC

…b.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer

� Conflicts:
�	src/components/views/rooms/MessageComposer.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
…b.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer
@t3chguy t3chguy requested a review from jryans June 2, 2020 13:21
@t3chguy t3chguy merged commit 8a93a9d into release-v2.7.0 Jun 2, 2020
@t3chguy t3chguy deleted the t3chguy/emoji_picker_composer branch June 2, 2020 13:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants