Merge branch 'develop' into notification-title

# Conflicts: # src/displayapp/screens/Notifications.cpp
2021-04-09 20:47:24 +02:00
parent 3934e9bef2 9096d1db4c
commit 63584b6561
489 changed files with 58749 additions and 10588 deletions
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -164,7 +164,7 @@ Pinetime::Controllers::MusicService::MusicService(Pinetime::System::SystemTask &
  
  artistName = "Waiting for";
  albumName = "";
-  trackName = "track information...";
+  trackName = "track information..";
  playing = false;
  repeat = false;
  shuffle = false;