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
parent 7aec1bc308 ec6eee96d0
commit b2eaf5562d
19 changed files with 417 additions and 464 deletions
@@ -6,5 +6,6 @@
    url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
    url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
  font-weight: 400;
+  font-display: swap;
  font-style: normal;
 }