merge: resolve conflicts from main (keep development changes)

2026-01-07 10:53:12 +03:00
parent c343223ccd 2370ca7701
commit 05fb2c0e10
4 changed files with 54 additions and 2 deletions
@@ -71,6 +71,7 @@ web = ["getrandom/js"]
 serde = [
 	"bip39/serde",
 	"codec/serde",
+	"dep:serde",
 	"hex/serde",
 	"pezsp-core/serde",
 	"schnorrkel?/serde",