Claire f01605c665 Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' 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 '3389c41b5899c1da479bfc08e84588184e09902d' 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 '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

Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream

2024-02-29 19:02:31 +01:00

two_factor_authentication.js

Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

2023-05-28 15:54:31 +02:00