Kilrah
c34ed67343
Merge branch '2.3' into 3djc/T-Lite
# Conflicts:
# companion/src/firmwares/boards.h
# companion/src/firmwares/opentx/opentxeeprom.h
# radio/src/gui/common/stdlcd/radio_hardware.cpp
# radio/src/targets/common/arm/stm32/adc_driver.cpp
# radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
# radio/src/targets/taranis/board.h
# radio/src/targets/taranis/hal.h
# radio/src/targets/taranis/keys_driver.cpp
# radio/src/targets/taranis/lcd_driver_spi.cpp
2021-01-15 20:17:02 +01:00
..
2021-01-15 20:17:02 +01:00
2020-04-09 10:29:00 +02:00
2017-12-17 13:32:13 +01:00