Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Essem 2024-02-28 22:36:41 -06:00
commit 54a3fc3ac5
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
78 changed files with 778 additions and 1057 deletions

View file

@ -54,6 +54,13 @@
# Ignore Docker option files
docker-compose.override.yml
# Ignore public
/public/assets
/public/emoji
/public/packs
/public/packs-test
/public/system
# Ignore emoji map file
/app/javascript/mastodon/features/emoji/emoji_map.json
@ -74,6 +81,7 @@ app/javascript/styles/mastodon/reset.scss
# Ignore the generated AUTHORS.md
AUTHORS.md
# Process a few selected JS files
!lint-staged.config.js
# Ignore glitch-soc emoji map file