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 91f66ece5a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		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 style for hashes (#20518)	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	Change link previews for statuses to never use avatar as fallback (#23376)	2 years ago
_poll.html.haml	Refactor formatter (#17828)	3 years ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
_status.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	3 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