mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 16:44:04 -05:00
6204d13a2e
Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it. |
||
---|---|---|
.. | ||
actions | ||
ISSUE_TEMPLATE | ||
workflows | ||
codecov.yml | ||
renovate.json5 | ||
stale.yml | ||
stylelint-matcher.json |