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 20fb459dee Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2 years ago
..
_theme.html.haml	Fix missing media: 'all' on default skins	3 years ago
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
embedded.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailer.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	7 years ago
modal.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago