Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

ISSUE_TEMPLATE

Remove references to discourse.joinmastodon.org (#17797)

2022-03-15 08:13:22 +01:00

workflows

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-22 17:00:38 +01:00

FUNDING.yml

Remove references to discourse.joinmastodon.org (#17797)

2022-03-15 08:13:22 +01:00

stale.yml

Change stale bot to only touch pull requests over 120 days old (#12217)

2019-10-26 12:45:52 +02:00