Merge remote-tracking branch 'upstream/master' into dead-code-society

2020-07-26 18:28:32 +02:00
parent 54166af4d1 18a84eeb32
commit dc5af7d19f
54 changed files with 126 additions and 90 deletions
@@ -16,7 +16,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
            show('/settings/settings.html');
        },
        showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
        }
    };