Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
workflows	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +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
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2022-06-16 22:09:43 +02:00