mastodon/app/javascript/packs
Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
2023-04-22 10:06:11 +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
error.js
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-22 10:06:11 +02:00
share.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00