Claire 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.		2023-06-10 15:32:29 +02:00
..
admin
accounts_helper.rb
application_helper.rb
branding_helper.rb
context_helper.rb
domain_control_helper.rb
email_helper.rb
flashes_helper.rb
formatting_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
languages_helper.rb
mascot_helper.rb
media_component_helper.rb
react_component_helper.rb
routing_helper.rb
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb