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.

Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
_attachment_list.html.haml	…
_detailed_status.html.haml	Change reported media attachments to always be hidden in admin UI (#12879)	5 years ago
_og_description.html.haml	…
_og_image.html.haml	…
_poll.html.haml	Improve polls: option lengths & redesign (#13257)	5 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
_status.html.haml	…
embed.html.haml	Fix cache digesting log noise on status embeds (#12750)	5 years ago
show.html.haml	Fix punycode being rendered instead of unicode in some places (#13030)	5 years ago