Skip to content
Snippets Groups Projects
Commit e60a235e authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Merge branch 'master' into feature/startup_node_selection 

# Conflicts:
#	app/config.json
#	dist/desktop
#	www/license/license_g1-es-ES.md
#	www/license/license_g1-it-IT.md
parents f0fb7f83 467ec681
No related branches found
No related tags found
1 merge request!647[enh] If node unreachable, select a random UP fallback peer
Pipeline #18835 skipped
Stage: alt_build
    This commit is part of merge request !647. Comments created here will be created in the context of that merge request.
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing
    with 1778 additions and 17 deletions
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment