Claire f01605c665 Merge commit '3389c41b58' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.		2024-03-01 13:02:59 +01:00
..
admin.ts	Merge commit '3389c41b58' into glitch-soc/merge-upstream	2024-03-01 13:02:59 +01:00
auth.js
common.js
embed.js
inert.js	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
mailer.js
remote_interaction_helper.ts	Merge commit '548c032dbb' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
settings.js	Fix @rails/ujs imports	2023-10-24 20:23:31 +02:00
theme.yml	Merge commit '958a810553' into glitch-soc/merge-upstream	2024-02-29 19:02:31 +01:00
two_factor_authentication.js	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00