mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 12:13:18 -05:00
93c714417f
Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.