mastodon-glitch/.github
Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
2025-02-05 18:21:36 +01:00
..
ISSUE_TEMPLATE Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
actions Add support for libvips in addition to ImageMagick (#30090) 2024-06-05 19:15:39 +00:00
workflows Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 2025-02-05 18:21:36 +01:00
codecov.yml Second attempt at disabling Codecov annotations (#31841) 2024-09-10 14:00:23 +00:00
renovate.json5 Use ruby version 3.4.1 (#33304) 2025-01-07 13:46:56 +00:00
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00