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 67da47d081 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 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	Change number_to_human calls to always use 3-digits precision (#16469)	3 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 various issues around OpenGraph representation of media (#14133)	4 years ago
_poll.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
_status.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
show.html.haml	add og:published_time to opengraph meta tags (#14865)	4 years ago