Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-12-02 21:49:12 +01:00
..
api	Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3	2024-12-02 21:49:12 +01:00
auth/sessions	…
oauth	…
settings	…
statuses	…
well_known	…
account_show_page_spec.rb	…
accounts_spec.rb	…
anonymous_cookies_spec.rb	…
backups_spec.rb	…
cache_spec.rb	…
catch_all_route_request_spec.rb	…
content_security_policy_spec.rb	…
custom_css_spec.rb	…
custom_stylesheets_spec.rb	…
disabled_oauth_endpoints_spec.rb	…
emojis_spec.rb	…
follower_accounts_spec.rb	…
following_accounts_spec.rb	…
health_spec.rb	…
instance_actor_spec.rb	…
invite_spec.rb	…
invites_spec.rb	…
link_headers_spec.rb	…
localization_spec.rb	…
log_out_spec.rb	…
mail_subscriptions_spec.rb	…
manifest_spec.rb	…
media_proxy_spec.rb	…
media_spec.rb	…
omniauth_callbacks_spec.rb	…
remote_interaction_helper_spec.rb	…
self_destruct_spec.rb	…
severed_relationships_spec.rb	…
signature_verification_spec.rb	…
tags_spec.rb	…