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 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2 years ago
..
_theme.html.haml	Fix missing media: 'all' on default skins	3 years ago
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
embedded.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailer.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 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	2 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago