fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-01 09:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire b2eaf5562d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.
2021-10-14 22:14:26 +02:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02: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 2021-10-14 21:44:57 +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-14 22:14:26 +02:00