Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
_theme.html.haml	Fix missing media: 'all' on default skins	2022-01-16 22:26:18 +01:00
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
application.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +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 branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
mailer.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08: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	2022-03-02 18:02:48 +01:00
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
public.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00