diff options
| author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
| commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
| tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /lib/tasks | |
| parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
| parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) | |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/emojis.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake index a373e7652..8faa48a95 100644 --- a/lib/tasks/emojis.rake +++ b/lib/tasks/emojis.rake @@ -45,7 +45,7 @@ end namespace :emojis do desc 'Generate a unicode to filename mapping' task :generate do - source = 'http://www.unicode.org/Public/emoji/12.0/emoji-test.txt' + source = 'http://www.unicode.org/Public/emoji/13.1/emoji-test.txt' codes = [] dest = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json') |