Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.		2023-05-25 20:43:25 +02:00
..
about
accounts
admin	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream	2023-05-25 20:43:25 +02:00
admin_mailer
application
auth	[Glitch] Update style of captcha confirmation page to match sign-up form (#2226)	2023-05-25 19:14:37 +02:00
authorize_interactions
custom_css
disputes/strikes
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
media	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
notification_mailer
oauth
privacy
relationships
settings	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
shared
shares
statuses
statuses_cleanup
tags
user_mailer
well_known/host_meta