diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
| commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
| tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/containers/settings/ServicesScreen.js | |
| parent | Sort languages by name (diff) | |
| parent | Add color to service icons (diff) | |
| download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip | |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/containers/settings/ServicesScreen.js')
| -rw-r--r-- | src/containers/settings/ServicesScreen.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index 8cfe5efbf..12db1bcd3 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js | |||
| @@ -53,6 +53,7 @@ export default class ServicesScreen extends Component { | |||
| 53 | goTo={router.push} | 53 | goTo={router.push} |
| 54 | servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError} | 54 | servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError} |
| 55 | retryServicesRequest={() => services.allServicesRequest.reload()} | 55 | retryServicesRequest={() => services.allServicesRequest.reload()} |
| 56 | searchNeedle={services.filterNeedle} | ||
| 56 | /> | 57 | /> |
| 57 | ); | 58 | ); |
| 58 | } | 59 | } |