From d5e85626dc45951de697a99149b164ed0f90a21a Mon Sep 17 00:00:00 2001 From: "alexandr.kravchenko" <alexander.kravchenko@demlabs.net> Date: Thu, 13 Feb 2020 17:45:47 +0500 Subject: [PATCH] Merged with support-2649 and resolved conflicts on master --- libdap-chain-common | 2 +- libdap-chain-net | 2 +- libdap-chain-net-srv | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-chain-wallet | 2 +- libdap-crypto | 2 +- libdap-stream-ch-chain-net-srv | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libdap-chain-common b/libdap-chain-common index a831b434..dde4bb64 160000 --- a/libdap-chain-common +++ b/libdap-chain-common @@ -1 +1 @@ -Subproject commit a831b434bc840cebb1cc6cf1a913bf606286c28d +Subproject commit dde4bb6403957dcbd2e0a983b36661ad303f5756 diff --git a/libdap-chain-net b/libdap-chain-net index 1b96ebed..b92ccafc 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 1b96ebed0b0c747cad00b834b87e402abad9eaf8 +Subproject commit b92ccafc47577e91f55073edf8b2eae1e94fc83c diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 05cd2947..c28d683b 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 05cd2947d6e3547e3e111b53befeff4b043cb16a +Subproject commit c28d683b226c8d39cd898609eb15a4049e74cf4e diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index e0f74dbc..db5a7df2 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit e0f74dbc745a65bb040a41e99460b21b14406a1d +Subproject commit db5a7df2164c4e5a09a15464b8446e8ccb0cb97f diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 64ad6f9a..14ad232a 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 64ad6f9a7ceccdf4f3ddd9ffe0b9b8d6d4b1027a +Subproject commit 14ad232a6073aea30abcff53d69f91bcd0f5e1a5 diff --git a/libdap-crypto b/libdap-crypto index 1688d692..1dfccbe8 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit 1688d69223b19de929eed4f8dc61332aaec8dd46 +Subproject commit 1dfccbe81c132d06b8d54d76b65c3e25969f444d diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 51c01481..001b68d4 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 51c01481f87f3ffc1fdad3054292bf910d2c5f31 +Subproject commit 001b68d44aa11bbeb28b473e1ba41364497a6d6a -- GitLab