mastodon/.github
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
2023-08-24 21:56:00 +02:00
..
ISSUE_TEMPLATE Improve the bug report templates (#25621) 2023-07-21 10:46:12 +02:00
workflows Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 2023-08-24 21:56:00 +02:00
FUNDING.yml Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
renovate.json5 Fix lint:json not processing json5 extension (#26481) 2023-08-14 14:53:13 +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