forked from glitch-soc-github-mirror/mastodon
# Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
stale.yml | ||
stylelint-matcher.json |
# Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
stale.yml | ||
stylelint-matcher.json |