Merge branch 'develop' into notification-title
# Conflicts: # src/displayapp/screens/Notifications.cpp
This commit is contained in:
commit
63584b6561
489 changed files with 58749 additions and 10588 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue