Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.
This commit is contained in:
Claire
2025-12-18 18:10:30 +01:00
parent 177d3c59d0 a8109e50fc
commit 97ff0f94bf
60 changed files with 293 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/emojis.rake
View File

@@ -60,7 +60,7 @@ end
namespace :emojis do
desc 'Generate a unicode to filename mapping'
task :generate do
source = 'http://www.unicode.org/Public/emoji/16.0/emoji-test.txt'
source = 'https://www.unicode.org/Public/emoji/16.0/emoji-test.txt'
codes = []
dest = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')