Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.		2024-09-12 20:05:08 +02:00
..
admin.tsx	…
application.ts	…
common.js	[Glitch] Remove `font-awesome` npm package	2024-08-20 18:49:56 +02:00
embed.tsx	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
error.ts	…
inert.ts	…
mailer.ts	…
public-path.ts	…
public.tsx	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
remote_interaction_helper.ts	…
share.tsx	…
sign_up.ts	…
two_factor_authentication.ts	…