Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`

2023-12-10 18:05:02 +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

Further reduce differences with upstream

2023-12-09 21:19: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 '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +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 '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

types

Change icons in web UI (#27385)

2023-10-24 17:45:08 +00:00