Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream ...

Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.

2023-10-24 19:31:14 +02:00

..

admin

…

accounts_helper.rb

…

application_helper.rb

…

authorized_fetch_helper.rb

…

branding_helper.rb

…

context_helper.rb

…

database_helper.rb

…

domain_control_helper.rb

…

email_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

…

routing_helper.rb

…

self_destruct_helper.rb

…

settings_helper.rb

…

statuses_helper.rb

…

webfinger_helper.rb

…