1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 14:49:01 +09:00
YuruToot/app/javascript/packs
Claire 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
..
admin.jsx Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
application.js Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
common.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 2020-10-21 21:28:47 +02:00
error.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 2020-10-13 01:19:35 +02:00
public-path.js Move ESLint configs to overrides (#24370) 2023-04-03 12:41:10 +02:00
public.jsx Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
share.jsx Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
sign_up.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00