about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-04-20 16:45:40 +0200
committerThibaut Girka <thib@sitedethib.com>2020-04-20 16:45:40 +0200
commit63dc7cfa904d83b92151597aa745963996a9c926 (patch)
tree1cf2d3225374c6d8f55bcf1c36f0b4ce5aee0911 /lib
parentd5530827c984238f93100ee737ed209d61e316c0 (diff)
parentf2cf91277119c63044bdd45e599f37dc829b6eb2 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/emojis.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 892afd898..70919fbdb 100644
--- 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')