Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.

2023-12-21 18:17:17 +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] Enable the eslint react/no-unknown-property rule

2023-12-20 22:24:40 +01:00

fonts

…

hooks

[Proposal] Make able to write React in Typescript (#16210)

2023-04-03 03:31:39 +02:00

icons

…

images

Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

2023-06-25 14:27:38 +02:00

mastodon

Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream

2023-12-21 18:17:17 +01:00

packs

Fix @rails/ujs import on public.jsx (#2482)

2023-11-24 17:40:31 +01:00

skins

…

styles

Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream

2023-12-20 21:58:18 +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