Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream ...

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

2024-01-02 13:35:11 +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

Fix media attachments not being hidden in report modal in glitch flavor

2023-12-29 17:47:30 +01:00

fonts

…

hooks

…

icons

…

images

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

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

mastodon

Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream

2024-01-02 13:35:11 +01:00

packs

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

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

skins

…

styles

Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream

2023-12-29 17:40:57 +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