merge: resolve conflicts from main (keep development changes)

This commit is contained in:
2026-01-07 10:53:12 +03:00
4 changed files with 54 additions and 2 deletions
-1
View File
@@ -152,7 +152,6 @@ serde = [
"log/serde",
"parking_lot?/serde",
"pezsp-storage/serde",
"primitive-types/serde",
"primitive-types/serde_no_std",
"rand?/serde",
"scale-info/serde",