Skip to content

Commit 14e4d59

Browse files
ardocratardocrat
committed
Merge branch 'staging' into grim
# Conflicts: # Cargo.lock
2 parents 025424f + f4b92ce commit 14e4d59

19 files changed

Lines changed: 1101 additions & 626 deletions

File tree

‎Cargo.lock‎

Lines changed: 15 additions & 193 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ description = "APIs for grin, a simple, private and scalable cryptocurrency impl
66
license = "Apache-2.0"
77
repository = "https://github.com/mimblewimble/grin"
88
keywords = [ "crypto", "grin", "mimblewimble" ]
9-
workspace = ".."
109
edition = "2021"
1110

1211
[dependencies]

‎chain/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ description = "Chain implementation for grin, a simple, private and scalable cry
66
license = "Apache-2.0"
77
repository = "https://github.com/mimblewimble/grin"
88
keywords = [ "crypto", "grin", "mimblewimble" ]
9-
workspace = ".."
109
edition = "2021"
1110

1211
[dependencies]

‎config/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ description = "Configuration for grin, a simple, private and scalable cryptocurr
66
license = "Apache-2.0"
77
repository = "https://github.com/mimblewimble/grin"
88
keywords = [ "crypto", "grin", "mimblewimble" ]
9-
workspace = ".."
109
edition = "2021"
1110

1211
[dependencies]

‎core/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ description = "Chain implementation for grin, a simple, private and scalable cry
66
license = "Apache-2.0"
77
repository = "https://github.com/mimblewimble/grin"
88
keywords = [ "crypto", "grin", "mimblewimble" ]
9-
workspace = ".."
109
edition = "2021"
1110

1211
[dependencies]

0 commit comments

Comments
 (0)