Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes.		2024-10-16 12:42:12 +02:00
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
actions	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
workflows	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
codecov.yml	Second attempt at disabling Codecov annotations (#31841)	2024-09-10 14:00:23 +00:00
renovate.json5	Use `conflicted` configuration for renovate rebase strategy (#31770)	2024-09-05 14:41:14 +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