Claire 65ca37bbaa Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.

2024-03-13 20:14:18 +01:00

..

admin

…

accounts_helper.rb

…

application_helper.rb

Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream

2024-03-13 20:14:18 +01:00

authorized_fetch_helper.rb

…

branding_helper.rb

…

context_helper.rb

…

database_helper.rb

…

domain_control_helper.rb

…

email_helper.rb

…

filters_helper.rb

…

flashes_helper.rb

…

formatting_helper.rb

…

home_helper.rb

…

instance_helper.rb

…

invites_helper.rb

…

jsonld_helper.rb

…

languages_helper.rb

…

mascot_helper.rb

…

media_component_helper.rb

…

react_component_helper.rb

…

registration_helper.rb

…

routing_helper.rb

…

self_destruct_helper.rb

…

settings_helper.rb

…

statuses_helper.rb

…

webfinger_helper.rb

…