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

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

core

[Glitch] Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 21:45:01 +02:00

flavours

[Glitch] Add support for private pinned posts

2022-01-17 08:35:27 +01:00

fonts

…

images

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

2020-05-13 22:11:49 +02:00

locales

…

mastodon

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

2022-01-17 10:45:25 +01:00

packs

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

2021-12-16 16:20:44 +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-01-17 10:45:25 +01:00