Skip to content
Snippets Groups Projects
Verified Commit a551c486 authored by Zoe Michaela Dietmar Pfister's avatar Zoe Michaela Dietmar Pfister :gay_pride_flag:
Browse files

Merge remote-tracking branch 'origin/38-ntp-server-redundancy' into develop 

# Conflicts:
#	host/host_central_mast/src/main.cpp
parents 1a9fc691 67602608
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 541 additions and 0 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