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 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2 years ago
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth.js	…
common.js	…
embed.js	…
mailer.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
public.js	…
settings.js	…
theme.yml	…
two_factor_authentication.js	…