mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 02:50:14 -05:00
876aa35350
Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. |
||
---|---|---|
.. | ||
actions | ||
ISSUE_TEMPLATE | ||
workflows | ||
codecov.yml | ||
renovate.json5 | ||
stale.yml | ||
stylelint-matcher.json |