Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
This commit is contained in:
Claire
2022-12-15 20:25:25 +01:00
103 changed files with 1228 additions and 274 deletions

View File

@ -1682,7 +1682,7 @@ a.sparkline {
min-height: 100%;
a {
text: &highlight-text-color;
color: $highlight-text-color;
text-decoration: none;
&:hover {