This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' 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.		2023-05-25 22:49:18 +02:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
appearance	…
branding	…
content_retention	…
discovery	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
other	…
registrations	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
shared	…