diff options
author | Bennett <properly@protonmail.com> | 2019-09-17 12:18:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 12:18:31 +0200 |
commit | 78959fe93f259210e30c63940bbfb721b3db5583 (patch) | |
tree | 8d08c972023d67513de0dc60e76fc8439ee2be56 /src/containers/settings/EditSettingsScreen.js | |
parent | Implement #37 (diff) | |
parent | Merge pull request #42 from kytwb/all-contributors/add-justus-saul (diff) | |
download | ferdium-app-78959fe93f259210e30c63940bbfb721b3db5583.tar.gz ferdium-app-78959fe93f259210e30c63940bbfb721b3db5583.tar.zst ferdium-app-78959fe93f259210e30c63940bbfb721b3db5583.zip |
Merge branch 'master' into issue-37
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 09e7b43ab..778b70ad9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -289,6 +289,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
289 | cacheSize, | 289 | cacheSize, |
290 | updateStatusTypes, | 290 | updateStatusTypes, |
291 | isClearingAllCache, | 291 | isClearingAllCache, |
292 | server, | ||
292 | } = app; | 293 | } = app; |
293 | const { | 294 | const { |
294 | checkForUpdates, | 295 | checkForUpdates, |
@@ -314,6 +315,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
314 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} | 315 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} |
315 | isTodosEnabled={todos.isFeatureActive} | 316 | isTodosEnabled={todos.isFeatureActive} |
316 | isWorkspaceEnabled={workspaces.isFeatureActive} | 317 | isWorkspaceEnabled={workspaces.isFeatureActive} |
318 | server={server || 'https://api.franzinfra.com'} | ||
317 | /> | 319 | /> |
318 | </ErrorBoundary> | 320 | </ErrorBoundary> |
319 | ); | 321 | ); |