mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-12 00:29:04 +01:00
ad1098970b
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. |
||
|---|---|---|
| .. | ||
| about | ||
| appearance | ||
| branding | ||
| content_retention | ||
| discovery | ||
| other | ||
| registrations | ||
| shared | ||