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, 3 insertions, 0 deletions

diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 0146f5b35..2daf55676 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -16,6 +16,7 @@ class TabBarSortableList extends Component {
     toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   }
 
   render() {
@@ -27,6 +28,7 @@ class TabBarSortableList extends Component {
       toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
 
@@ -46,6 +48,7 @@ class TabBarSortableList extends Component {
             toggleAudio={() => toggleAudio({ serviceId: service.id })}
             deleteService={() => deleteService({ serviceId: service.id })}
             disableService={() => disableService({ serviceId: service.id })}
+            enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
           />
         ))}