Skip to content

Commit

Permalink
Merge branch 'master' into umbrella-alliance
Browse files Browse the repository at this point in the history
  • Loading branch information
runcomet authored Nov 29, 2024
2 parents b90040b + 1d519a1 commit b37c462
Show file tree
Hide file tree
Showing 12 changed files with 869 additions and 584 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ sc-tracing-proc-macro = { path = "substrate/client/tracing/proc-macro", default-
sc-transaction-pool = { path = "substrate/client/transaction-pool", default-features = false }
sc-transaction-pool-api = { path = "substrate/client/transaction-pool/api", default-features = false }
sc-utils = { path = "substrate/client/utils", default-features = false }
scale-info = { version = "2.11.1", default-features = false }
scale-info = { version = "2.11.6", default-features = false }
schemars = { version = "0.8.13", default-features = false }
schnellru = { version = "0.2.3" }
schnorrkel = { version = "0.11.4", default-features = false }
Expand Down
Loading

0 comments on commit b37c462

Please sign in to comment.