Merge branch '2.3.1' into 2.3

# Conflicts: # CREDITS.txt # radio/src/gui/480x272/radio_hardware.cpp
2019-10-05 11:41:48 +02:00
parent 268c4d4ece 63614a06f8
commit b40dfdf12b
72 changed files with 544 additions and 419 deletions
@@ -33,7 +33,6 @@
  #define SWITCH_WARNING_LIST_Y        4*FH+4
 #endif

-
 enum LogicalSwitchContextState {
  SWITCH_START,
  SWITCH_DELAY,