Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2023-03-16 23:12:59 +01:00
..
account_relationships_presenter_spec.rb	Add follow request banner on account header (#20785)	2022-12-15 18:50:11 +01:00
familiar_followers_presenter_spec.rb	Autofix Rubocop RSpec/LeadingSubject (#23670)	2023-02-20 13:24:14 +09: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	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00