Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream ... - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.		2024-12-01 17:36:49 +01:00
..
ISSUE_TEMPLATE	Fix issue templates (#2904)	2024-11-24 20:44:03 +01:00
actions	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
workflows	Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream	2024-12-01 17:36:49 +01: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