Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
admin	…
accounts_helper.rb	…
application_helper.rb	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +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	…
json_ld_helper.rb	…
languages_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	…
theme_helper.rb	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00