Claire ee1de4206a Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.		2023-06-10 16:48:01 +02:00
..
account_relationships_presenter_spec.rb	Fix `RSpec/DescribedClass` cop (#25104)	2023-06-06 13:58:33 +02:00
familiar_followers_presenter_spec.rb	Autofix Rubocop RSpec/MatchArray (#24050)	2023-04-26 20:21:54 +02:00
instance_presenter_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
status_relationships_presenter_spec.rb	Fix `RSpec/DescribedClass` cop (#25104)	2023-06-06 13:58:33 +02:00