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 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.		2 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
appearance	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
branding	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
content_retention	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
discovery	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
other	Add back missing glitch-soc admin settings (#1919)	2 years ago
registrations	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	2 years ago
shared	Add back missing glitch-soc admin settings (#1919)	2 years ago