Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
actions	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
workflows	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
codecov.yml	Case correction Github -> GitHub (#30446)	2024-06-08 10:32:39 +00:00
renovate.json5	Add customManagers:dockerfileVersions to renovate.json5 (#30607)	2024-06-10 14:47:59 +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