mastodon/.github
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
..
ISSUE_TEMPLATE Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
workflows Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
FUNDING.yml
stale.yml
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00