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:
@ -1682,7 +1682,7 @@ a.sparkline {
|
||||
min-height: 100%;
|
||||
|
||||
a {
|
||||
text: &highlight-text-color;
|
||||
color: $highlight-text-color;
|
||||
text-decoration: none;
|
||||
|
||||
&:hover {
|
||||
|
Reference in New Issue
Block a user