nyastodon/app/javascript
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
..
__mocks__ Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
core Fix @rails/ujs imports 2023-10-24 20:23:31 +02:00
flavours [Glitch] Fix empty column explainer getting cropped under certain conditions 2023-12-21 19:08:43 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 2023-12-21 19:24:10 +01:00
packs Fix @rails/ujs import on public.jsx (#2482) 2023-11-24 17:40:31 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
svg-icons Add icons for private and disabled boost in web UI (#27817) 2023-11-13 14:39:45 +00:00
types Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00