mastodon/app/javascript/packs
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
admin.jsx Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
application.js Fix missing await (#19273) 2022-10-03 23:08:38 +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 branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
share.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00