mastodon-glitch/app/javascript
Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
..
core [Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere 2023-05-09 22:28:53 +02:00
flavours Fix margins around small avatars (reply indicators, autocompletion suggestion) (#2231) 2023-05-25 19:40:33 +02:00
fonts
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons
images Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
locales Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169) 2023-04-08 14:11:40 +02:00
mastodon Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
packs Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 2023-05-09 23:12:48 +02:00
skins
styles Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
types Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00