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		2023-08-11 22:15:41 +02:00
..
_theme.html.haml	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
application.html.haml	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
embedded.html.haml	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
error.html.haml	Switch to using a common runtime chunk rather than locales	2023-06-10 17:43:13 +02:00
helper_frame.html.haml	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
mailer.html.haml	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
modal.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00