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/components/services/content/WebviewCrashHandler.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/components/services/content/WebviewCrashHandler.js')
| -rw-r--r-- | src/components/services/content/WebviewCrashHandler.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 24903f3c5..d48152c18 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
| @@ -25,7 +25,7 @@ const messages = defineMessages({ | |||
| 25 | }); | 25 | }); |
| 26 | 26 | ||
| 27 | @observer | 27 | @observer |
| 28 | export default class ServiceWebview extends Component { | 28 | export default class WebviewCrashHandler extends Component { |
| 29 | static propTypes = { | 29 | static propTypes = { |
| 30 | name: PropTypes.string.isRequired, | 30 | name: PropTypes.string.isRequired, |
| 31 | reload: PropTypes.func.isRequired, | 31 | reload: PropTypes.func.isRequired, |