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

Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.

2022-06-21 08:28:59 +02:00

..

core

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

2022-06-11 00:08:41 +02:00

flavours

Fix checkmark on interaction buttons with larger fonts (#1799)

2022-06-16 15:37:59 +02:00

fonts

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icons

Fix wrong aspect ratio of logo in icons (#18639)

2022-06-11 20:32:02 +02:00

images

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

2022-06-21 08:28:59 +02:00

locales

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

2018-12-01 21:00:16 +01:00

mastodon

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

2022-06-21 08:28:59 +02:00

packs

Change brand color and logotypes (#18592)

2022-06-09 22:25:23 +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-06-21 08:28:59 +02:00