You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 488cd37f1a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2 years ago
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_poll.html.haml	Setup haml-lint CI with todo config (#23524)	2 years ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
_status.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
show.html.haml	Add user profile OG tag on status page (#21423)	2 years ago