merge upstream and fix conflicts

This commit is contained in:
likelovewant
2024-12-12 13:17:55 +08:00
parent a0caaa2bc8
commit a64347c6d4
383 changed files with 59815 additions and 43978 deletions

View File

@@ -17,7 +17,7 @@
"celsius",
"fahrenheit"
],
"description": "The temperature unit to use. Infer this from the users location."
"description": "The temperature unit to use. Infer this from the user's location."
}
},
"required": [