mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-09 02:38:28 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles/fonts
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
..
montserrat.scss
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 22:14:26 +02:00
roboto-mono.scss
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 22:14:26 +02:00
roboto.scss
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 22:14:26 +02:00