diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src/config.js | |
parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip |
Merge branch 'develop' into feature/mute-service
# Conflicts:
# src/components/services/content/ServiceWebview.js
# src/components/services/content/Services.js
# src/components/services/tabs/TabItem.js
# src/containers/layout/AppLayoutContainer.js
Diffstat (limited to 'src/config.js')
-rw-r--r-- | src/config.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/config.js b/src/config.js index 651f2e174..1627993f5 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -10,7 +10,8 @@ export const DEFAULT_APP_SETTINGS = { | |||
10 | runInBackground: false, | 10 | runInBackground: false, |
11 | enableSystemTray: true, | 11 | enableSystemTray: true, |
12 | minimizeToSystemTray: false, | 12 | minimizeToSystemTray: false, |
13 | locale: 'en-us', // TODO: Replace with proper solution once translations are in | 13 | showDisabledServices: true, |
14 | locale: 'en-US', | ||
14 | beta: false, | 15 | beta: false, |
15 | isAppMuted: false, | 16 | isAppMuted: false, |
16 | }; | 17 | }; |