Claire c2f0ea415e Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.		2024-02-28 20:10:01 +01:00
..
admin.js	Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +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 '548c032dbb90ae9c06b05fc05724c49d0b552fd9' 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	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
two_factor_authentication.js	…