Skip to content

Commit 0896ba5

Browse files
committed
Merge branch 'develop' into chore/build-for-wasm32
2 parents 047af01 + c86013a commit 0896ba5

File tree

33 files changed

+4807
-1955
lines changed

33 files changed

+4807
-1955
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"BITCOIND_TEST": "1"
55
},
66
"rust-analyzer.rustfmt.extraArgs": ["+nightly"],
7-
"files.eol": "\n"
7+
"files.eol": "\n",
88
}

0 commit comments

Comments
 (0)