9e224add8a
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. |
||
|---|---|---|
| .. | ||
| core | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| locales | ||
| mastodon | ||
| packs | ||
| skins | ||
| styles | ||
| types | ||