Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`

2022-05-04 19:15:50 +02:00

..

core

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-01 16:52:27 +02:00

flavours

Move DM conversation/timeline tab to column settings switch

2022-05-03 11:45:23 +02:00

fonts

…

images

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00

locales

…

mastodon

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-04 19:15:50 +02:00

packs

Pre-fill domain block/allow domain from search filter (#18172)

2022-04-29 00:24:44 +02:00

skins

Glitchsoc translation to 'es' language (#1439)

2020-10-19 22:17:29 +02:00

styles

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-03 10:16:49 +02:00