Skip to content
Snippets Groups Projects
Commit eb4154e1 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

Merge branch 'develop' into bugs-2893 

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc
#	CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
#	libdap-qt-ui-qml
parents e8f8fb8a 040d5ecb
No related branches found
No related tags found
1 merge request!83Bugs 2893
Pipeline #1692 passed with stage
Stage: build
    in 15 minutes