mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 05:53:14 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/app/javascript/styles/fonts
History
Claire 95a1fde6b6 Merge commit '73b64b8917' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
..
roboto-mono.scss Merge commit '73b64b8917' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00
roboto.scss Merge commit '73b64b8917' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00