Merge branch 'develop' into new_touch_handler

This commit is contained in:
Riku Isokoski
2021-07-25 20:01:09 +03:00
32 changed files with 270 additions and 178 deletions

View File

@@ -27,7 +27,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
batteryController {batteryController},
dateTimeController {dateTimeController},
brightness {brightness},
motorController{motorController},
motorController {motorController},
settingsController {settingsController} {
// Time