This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
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
application.js
common.js
error.js
public-path.js
public.jsx Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
share.jsx