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

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.

2022-11-28 11:33:34 +01:00

..

core

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

2022-10-28 19:49:42 +02:00

flavours

Fix pillbar buttons in light theme (#1972)

2022-11-25 13:54:43 +01:00

fonts

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

2022-10-28 19:23:58 +02:00

icons

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00

images

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

2022-11-12 13:28:03 +01: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-11-28 11:33:34 +01:00

packs

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)

2022-11-17 11:05:09 +01: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-11-28 11:33:34 +01:00