Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' 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
..
about	…
accounts	…
admin	…
admin_mailer	…
application	…
auth	…
authorize_interactions	…
custom_css	…
disputes/strikes	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	…
oauth	…
privacy	…
relationships	…
settings	…
shared	…
shares	…
statuses	…
statuses_cleanup	…
tags	…
user_mailer	…
well_known/host_meta	…