Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
ISSUE_TEMPLATE	Update issue templates ot use the new GH Types, and add Troubleshooting template (#32484)	2024-10-15 11:49:15 +00:00
actions	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
workflows	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +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