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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		3 years ago
..
_theme.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
application.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
auth.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
embedded.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailer.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	6 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)	6 years ago
public.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago