mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-11-21 06:34:16 +01:00
Merge branch 'refs/heads/master' into merge_master_staging
# Conflicts: # api/src/owner.rs # controller/src/display.rs # controller/tests/accounts.rs # controller/tests/mwixnet.rs # controller/tests/revert.rs # controller/tests/slatepack.rs # controller/tests/transaction.rs # controller/tests/tx_list_filter.rs # grin # impls/src/lifecycle/default.rs # libwallet/src/api_impl/owner.rs # libwallet/src/internal/selection.rs # libwallet/src/internal/tx.rs # tests/cmd_line_basic.rs
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "grin_wallet_controller"
|
||||
version = "5.5.0"
|
||||
version = "5.5.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Controllers for grin wallet instantiation"
|
||||
license = "Apache-2.0"
|
||||
@@ -25,11 +25,11 @@ lazy_static = "1"
|
||||
thiserror = "1"
|
||||
qr_code = "1.1.0"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.5.0" }
|
||||
grin_wallet_api = { path = "../api", version = "5.5.0" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.5.0" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
|
||||
grin_wallet_config = { path = "../config", version = "5.5.0" }
|
||||
grin_wallet_util = { path = "../util", version = "5.5.1" }
|
||||
grin_wallet_api = { path = "../api", version = "5.5.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.5.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.5.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
||||
Reference in New Issue
Block a user