mastodon/app/javascript
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours Add missing locales to glitch-soc 2022-03-18 16:41:51 +01:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00