mastodon/.github
Claire 7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
2023-07-30 13:42:06 +02:00
..
ISSUE_TEMPLATE Improve the bug report templates (#25621) 2023-07-21 10:46:12 +02:00
workflows Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
FUNDING.yml Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
renovate.json5 Try to improve Renovatebot config (#26005) 2023-07-17 09:33:22 +02:00
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00