github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 15:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging_master

Browse Source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	api/Cargo.toml
#	api/src/foreign.rs
#	api/src/owner.rs
#	config/Cargo.toml
#	controller/Cargo.toml
#	controller/tests/common/mod.rs
#	impls/Cargo.toml
#	libwallet/Cargo.toml
#	util/Cargo.toml
This commit is contained in:
ardocrat
2026-06-23 13:10:57 +03:00
parent 4587eb918d 5c20635a24
commit 91da4e7875
11 changed files with 122 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "5.4.0-alpha.1"
version = "5.4.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
@@ -30,11 +30,11 @@ lazy_static = "1"
thiserror = "1"
qr_code = "1.1.0"
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
grin_wallet_api = { path = "../api", version = "5.4.0-alpha.1" }
grin_wallet_impls = { path = "../impls", version = "5.4.0-alpha.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
grin_wallet_util = { path = "../util", version = "5.4.1" }
grin_wallet_api = { path = "../api", version = "5.4.1" }
grin_wallet_impls = { path = "../impls", version = "5.4.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.1" }
grin_wallet_config = { path = "../config", version = "5.4.1" }
##### Grin Imports