Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
about	…
accounts	Fix being able to spoof link verification (#20217)	2022-11-09 08:24:21 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
admin_mailer	…
application	…
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-08 15:44:57 +01:00
authorize_interactions	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
custom_css	…
disputes/strikes	Add null check on application in dispute viewer (#19851)	2022-11-07 03:40:17 +01:00
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
oauth	…
privacy	…
relationships	…
settings	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
shared	…
shares	…
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-07 19:53:30 +01:00
statuses_cleanup	…
tags	…
user_mailer	…
well_known/host_meta	…