Merge branch 'develop' into pr/4549

2019-07-08 04:27:18 +09:00 · 2019-07-08 04:27:18 +09:00 · 05862a420f
commit 05862a420f
parent 22c4842154 393ad283e1
47 changed files with 441 additions and 83 deletions
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@ -38,6 +38,7 @@ const defaultSettings = {
 	homeProfiles: {},
 	mobileHomeProfiles: {},
 	deckProfiles: {},
+	uploadFolder: null,
 };

 const defaultDeviceSettings = {