Commit c9fa6af6 authored by Alexandr Mruchok's avatar Alexandr Mruchok

Merge branch 'features-4651'

# Conflicts:
#	DapCashWalletGUI/DapApplication.cpp
#	cellframe-ui-sdk
parents eca33601 b5fc6dd3
Pipeline #6435 failed with stage
in 8 minutes and 42 seconds