Merge pull request #2995 from matrix-org/matthew/twemoji

Replace emojione with twemoji + emojibase
This commit is contained in:
Matthew Hodgson 2019-05-21 11:32:53 +01:00 committed by GitHub
commit 30a485bddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 150 additions and 413 deletions

View file

@ -304,8 +304,6 @@ module.exports = React.createClass({
// return suitable content for the main (text) part of the status bar.
_getContent: function() {
const EmojiText = sdk.getComponent('elements.EmojiText');
if (this._shouldShowConnectionError()) {
return (
<div className="mx_RoomStatusBar_connectionLostBar">