Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ...

Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.

2024-01-13 12:11:29 +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

New Crowdin Translations (automated) (#2502)

2024-01-11 12:56:56 +01:00

fonts

…

hooks

…

icons

…

images

…

mastodon

Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream

2024-01-13 12:11:29 +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