Merge branch 'main' into glitch-soc/merge-upstream

2021-06-03 20:47:02 +02:00
parent 02dffa8edd f6088922c0
commit 0157caacef
498 changed files with 1454 additions and 551 deletions
--- 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')