Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add assets from Twemoji 13.1.0 #16345

Merged
merged 2 commits into from
Jun 1, 2021
Merged

Add assets from Twemoji 13.1.0 #16345

merged 2 commits into from
Jun 1, 2021

Conversation

Gargron
Copy link
Member

@Gargron Gargron commented Jun 1, 2021

Also, update emoji-mart so that newer emojis appear in the picker

@ClearlyClaire
Copy link
Contributor

ClearlyClaire commented Jun 1, 2021

Did you run rake emojis:generate_borders?

EDIT: actually it seems that none of the “bordered” emojis have been updated in Twemoji so it's fine by me.

@@ -12,7 +12,6 @@ import { assetHost } from 'mastodon/utils/config';
const messages = defineMessages({
emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
emoji_search: { id: 'emoji_button.search', defaultMessage: 'Search...' },
emoji_not_found: { id: 'emoji_button.not_found', defaultMessage: 'No emojos!! (╯°□°)╯︵ ┻━┻' },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing any fun from Mastodon eh :v

@Gargron Gargron merged commit abd7b46 into main Jun 1, 2021
@Gargron Gargron deleted the feature-twemoji-13.1.0 branch June 1, 2021 12:35
GensouSakuya pushed a commit to GensouSakuya/mastodon that referenced this pull request Jun 3, 2021
* Add assets from Twemoji 13.1.0

* Update emoji-mart
chrisguida pushed a commit to Start9Labs/mastodon that referenced this pull request Feb 26, 2022
* Add assets from Twemoji 13.1.0

* Update emoji-mart
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants