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

2020-04-20 16:45:40 +02:00
parent d5530827c9 f2cf912771
commit 63dc7cfa90
578 changed files with 672 additions and 446 deletions
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -15,7 +15,7 @@ end
 namespace :emojis do
  desc 'Generate a unicode to filename mapping'
  task :generate do
-    source = 'http://www.unicode.org/Public/emoji/11.0/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/12.0/emoji-test.txt'
    codes  = []
    dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')