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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
_attachment_list.html.haml	…
_detailed_status.html.haml	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	4 years ago
_og_description.html.haml	…
_og_image.html.haml	Fix various issues around OpenGraph representation of media (#14133)	5 years ago
_poll.html.haml	Fix end-user-facing uses of inline CSS (#13438)	5 years ago
_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	Fix cache digesting log noise on status embeds (#12750)	5 years ago
show.html.haml	add og:published_time to opengraph meta tags (#14865)	4 years ago