1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
YuruToot/app/javascript/flavours/glitch/packs
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.jsx Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 2024-02-28 20:10:01 +01:00
common.js Fix @rails/ujs imports 2023-10-24 20:23:31 +02:00
error.js Move flavours/glitch/utils/ready to flavours/glitch/ready 2022-10-11 11:31:11 +02:00
home.js [Glitch] Fix /share and cleanup and reorganize frontend locale loading 2023-06-10 16:18:01 +02:00
public.jsx Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 2024-02-28 20:10:01 +01:00
settings.js Fix @rails/ujs imports 2023-10-24 20:23:31 +02:00
share.jsx [Glitch] Change design of compose form in web UI 2024-02-22 23:06:12 +01:00
sign_up.js [Glitch] Add client-side timeout on resend confirmation button 2023-08-12 09:38:57 +02:00