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 d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.		4 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 'main' 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 'main' 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	6 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	4 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago
public.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago