tootlab-mastodon/app/javascript/flavours
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
..
glitch Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 2024-02-28 20:10:01 +01:00
vanilla Remove redundant asset preload (#2488) 2023-12-02 14:54:26 +01:00