Merge branch '2.3.0' into 2.3

# Conflicts:
#	CREDITS.txt
#	radio/src/telemetry/multi.cpp
#	tools/release23/tts.py
#	tools/release23/tts_common.py
This commit is contained in:
Kilrah
2019-09-28 14:16:27 +02:00
30 changed files with 524 additions and 520 deletions
@@ -106,6 +106,7 @@ void rotaryEncoderCheck()
if (g_eeGeneral.backlightMode & e_backlight_mode_keys) {
backlightOn();
}
inactivity.counter = 0;
#endif
}
}