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
..
contrast
fonts	Fix SCSS linting issues (#2207)	2023-05-07 15:04:59 +02:00
mastodon	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
mastodon-light	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2023-03-30 15:16:20 +02:00
application.scss	Add support for incoming rich text (#23913)	2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss	Fix SCSS linting issues (#2207)	2023-05-07 15:04:59 +02:00
mastodon-light.scss
win95.scss