diff options
author | Travis CI <travis@Traviss-Mac.local> | 2020-10-05 16:13:56 +0000 |
---|---|---|
committer | Travis CI <travis@Traviss-Mac.local> | 2020-10-05 16:13:56 +0000 |
commit | 0ed17b8494b0a67938e5605f723d1ec1bb55738f (patch) | |
tree | 51af89af37bca3e60c53f0eccad9c0ff82ca08bf /src/components/layout/AppLayout.js | |
parent | Echo 'Building...' before hanging build command for visibility [skip ci] (diff) | |
parent | Improved onboarding flow and settings empty states (#996) (diff) | |
download | ferdium-app-0ed17b8494b0a67938e5605f723d1ec1bb55738f.tar.gz ferdium-app-0ed17b8494b0a67938e5605f723d1ec1bb55738f.tar.zst ferdium-app-0ed17b8494b0a67938e5605f723d1ec1bb55738f.zip |
Merge remote-tracking branch 'source/develop' into HEAD
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r-- | src/components/layout/AppLayout.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 3b732e602..a60270a6f 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -9,6 +9,7 @@ import InfoBar from '../ui/InfoBar'; | |||
9 | import { Component as BasicAuth } from '../../features/basicAuth'; | 9 | import { Component as BasicAuth } from '../../features/basicAuth'; |
10 | import { Component as ShareFranz } from '../../features/shareFranz'; | 10 | import { Component as ShareFranz } from '../../features/shareFranz'; |
11 | import { Component as QuickSwitch } from '../../features/quickSwitch'; | 11 | import { Component as QuickSwitch } from '../../features/quickSwitch'; |
12 | import { Component as NightlyBuilds } from '../../features/nightlyBuilds'; | ||
12 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; | 13 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; |
13 | import ErrorBoundary from '../util/ErrorBoundary'; | 14 | import ErrorBoundary from '../util/ErrorBoundary'; |
14 | 15 | ||
@@ -197,6 +198,7 @@ class AppLayout extends Component { | |||
197 | <BasicAuth /> | 198 | <BasicAuth /> |
198 | <ShareFranz /> | 199 | <ShareFranz /> |
199 | <QuickSwitch /> | 200 | <QuickSwitch /> |
201 | <NightlyBuilds /> | ||
200 | <PublishDebugInfo /> | 202 | <PublishDebugInfo /> |
201 | {services} | 203 | {services} |
202 | {children} | 204 | {children} |