1
0
puyopuyotetr.is/app/javascript/mastodon/features/compose
Claire 22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
..
components Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
containers Fix search form re-rendering spuriously in web UI (#28876) 2024-01-24 07:03:30 +00:00
util Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
index.jsx Add a new @/ alias for the root frontend directory and use it where possible (#28753) 2024-01-16 10:27:26 +00:00