mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 11:48:46 +00:00
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`. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
stale.yml | ||
stylelint-matcher.json |