Merge branch 'halo-direct-path-retries' of github.com:mikecarper/MeshCore into halo-direct-path-retries
# Conflicts: # examples/simple_repeater/MyMesh.cpp # src/helpers/CommonCLI.cpp
This commit is contained in:
commit
4fc5476fa6
# Conflicts: # examples/simple_repeater/MyMesh.cpp # src/helpers/CommonCLI.cpp