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

1 files changed, 10 insertions, 0 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 6dc2175e1..b10acf3c6 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -39,6 +39,10 @@ const messages = defineMessages({
     id: 'settings.app.form.language',
     defaultMessage: '!!!Language',
   },
+  showDisabledServices: {
+    id: 'settings.app.form.showDisabledServices',
+    defaultMessage: '!!!Display disabled services tabs',
+  },
   beta: {
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
@@ -68,6 +72,7 @@ export default class EditSettingsScreen extends Component {
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        showDisabledServices: settingsData.showDisabledServices,
         locale: settingsData.locale,
         beta: settingsData.beta,
       },
@@ -119,6 +124,11 @@ export default class EditSettingsScreen extends Component {
           value: settings.all.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        showDisabledServices: {
+          label: intl.formatMessage(messages.showDisabledServices),
+          value: settings.all.showDisabledServices,
+          default: DEFAULT_APP_SETTINGS.showDisabledServices,
+        },
         locale: {
           label: intl.formatMessage(messages.language),
           value: app.locale,