aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/layout/AppLayoutContainer.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-06-13 13:22:27 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-06-13 13:22:27 +0200
commitf65677735b02326870ada2100b55222fa69a401d (patch)
tree53adfc38c0a493e5e8fef3211d0e82b7d164d9ff /src/containers/layout/AppLayoutContainer.js
parentEnforce service limit (diff)
parentMerge branch 'release/5.2.0-beta.2' (diff)
downloadferdium-app-f65677735b02326870ada2100b55222fa69a401d.tar.gz
ferdium-app-f65677735b02326870ada2100b55222fa69a401d.tar.zst
ferdium-app-f65677735b02326870ada2100b55222fa69a401d.zip
Merge branch 'develop' into feature/service-limit
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
-rw-r--r--src/containers/layout/AppLayoutContainer.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index d2891a6a4..d290a6094 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -23,7 +23,6 @@ import { state as delayAppState } from '../../features/delayApp';
23import { workspaceActions } from '../../features/workspaces/actions'; 23import { workspaceActions } from '../../features/workspaces/actions';
24import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; 24import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
25import { workspaceStore } from '../../features/workspaces'; 25import { workspaceStore } from '../../features/workspaces';
26import { announcementsStore } from '../../features/announcements';
27 26
28export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { 27export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
29 static defaultProps = { 28 static defaultProps = {
@@ -151,7 +150,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
151 areRequiredRequestsLoading={requests.areRequiredRequestsLoading} 150 areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
152 darkMode={settings.all.app.darkMode} 151 darkMode={settings.all.app.darkMode}
153 isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} 152 isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
154 isAnnouncementVisible={announcementsStore.isAnnouncementVisible}
155 > 153 >
156 {React.Children.count(children) > 0 ? children : null} 154 {React.Children.count(children) > 0 ? children : null}
157 </AppLayout> 155 </AppLayout>