diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-20 18:25:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 18:25:18 +0200 |
| commit | 60f8a63a76f7c866b5338c33a8b897ba022368ca (patch) | |
| tree | b816c0e92ade09712e9bcce29716e762f38769c1 /lib | |
| parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
| parent | 221ea4787fe0caf0f8a3238ab95e97aaac8fe360 (diff) | |
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -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 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') |