tootlab-mastodon/app/javascript/core
Claire 1ad91dece8 Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.
2024-02-24 15:35:56 +01:00
..
admin.js Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream 2024-02-24 15:35:56 +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