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

Merge branch 'master' into features-2608 

# Conflicts:
#	CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
#	CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
parents 530ced42 d0cf5fb5
No related branches found
No related tags found
2 merge requests!59Features 2608,!51Features 2608
Pipeline #1431 passed with stage
in 19 minutes and 45 seconds