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 f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
_attachment_list.html.haml	…
_detailed_status.html.haml	Add account sensitized (#14361)	4 years ago
_og_description.html.haml	…
_og_image.html.haml	…
_poll.html.haml	…
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
_status.html.haml	Change public thread view to hide "Show thread" link (#15266)	4 years ago
embed.html.haml	…
show.html.haml	add og:published_time to opengraph meta tags (#14865)	4 years ago