Thomas Göttgens
f0c97b8806
Merge branch 'master' into apollo
# Conflicts:
# arch/esp32/esp32.ini
# arch/nrf52/nrf52.ini
# arch/portduino/portduino.ini
# arch/stm32/stm32.ini
# protobufs
# src/gps/GPS.cpp
# src/main.cpp
# src/mesh/StreamAPI.cpp
# src/modules/ExternalNotificationModule.h
# src/modules/NeighborInfoModule.cpp