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 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README		1 year ago
..
_theme.html.haml	Fix glitch-soc HAML linting issues (#2166)	2 years ago
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.html.haml	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	1 year ago
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
embedded.html.haml	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	1 year ago
error.html.haml	Switch to using a `common` runtime chunk rather than `locales`	1 year ago
helper_frame.html.haml	Change interaction modal in web UI (#26075)	1 year ago
mailer.html.haml	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	1 year 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	2 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago