This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
2021-10-25 20:28:51 +02:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours translation glitch's web interface [ja] 2021-10-24 00:05:33 +09:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-10-25 20:28:51 +02:00
packs [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +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 2021-10-25 20:28:51 +02:00