mastodon/app/javascript
Claire 6ee3e382df Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
2023-09-02 13:18:16 +02:00
..
core Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 2023-09-02 13:18:16 +02:00
flavours
…
fonts
…
hooks
…
icons
…
images
…
mastodon
…
packs Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 2023-09-02 13:18:16 +02:00
skins
…
styles
…
types
…