Merge remote-tracking branch 'origin/develop' into develop

2022-04-22 19:47:19 -07:00 · 2022-04-22 19:47:19 -07:00 · 288ea77eb2
commit 288ea77eb2
parent 39e952c15b daa3aa7244
6 changed files with 303 additions and 8 deletions
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@ -154,7 +154,8 @@ export class Store {
        "advanced": {
            "AudioContext": false,
            "experiments": [],
-            "playlistTrackMapping": true
+            "playlistTrackMapping": true,
+            "ffmpegLocation": ""
        },
        "connectUser": {
            "auth": null,