Merge branch 'uwbmaster' into 'LUT_to_YAML'
# Conflicts: # pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp # pps_ws/src/d_fall_pps/include/TeacherService.h # pps_ws/src/d_fall_pps/src/TeacherService.cpp
To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch
# Conflicts: # pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp # pps_ws/src/d_fall_pps/include/TeacherService.h # pps_ws/src/d_fall_pps/src/TeacherService.cpp