aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-02-26 15:38:20 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-02-26 15:38:20 +0100
commitb5ad31e316c1074cfa6f57f83e262a607eda9d44 (patch)
treeaffcfbc28b8892388ab23d97415902edfc682cab /src/components/layout
parentfinish basic workspace settings (diff)
parentremove unused packages (diff)
downloadferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.gz
ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.zst
ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.zip
fixes merge conflicts with latest develop
Diffstat (limited to 'src/components/layout')
-rw-r--r--src/components/layout/AppLayout.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index bce792e56..593149e72 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -7,6 +7,7 @@ import { TitleBar } from 'electron-react-titlebar';
7import InfoBar from '../ui/InfoBar'; 7import InfoBar from '../ui/InfoBar';
8import { Component as DelayApp } from '../../features/delayApp'; 8import { Component as DelayApp } from '../../features/delayApp';
9import { Component as BasicAuth } from '../../features/basicAuth'; 9import { Component as BasicAuth } from '../../features/basicAuth';
10import { Component as ShareFranz } from '../../features/shareFranz';
10import ErrorBoundary from '../util/ErrorBoundary'; 11import ErrorBoundary from '../util/ErrorBoundary';
11 12
12// import globalMessages from '../../i18n/globalMessages'; 13// import globalMessages from '../../i18n/globalMessages';
@@ -164,6 +165,7 @@ export default @observer class AppLayout extends Component {
164 )} 165 )}
165 {isDelayAppScreenVisible && (<DelayApp />)} 166 {isDelayAppScreenVisible && (<DelayApp />)}
166 <BasicAuth /> 167 <BasicAuth />
168 <ShareFranz />
167 {services} 169 {services}
168 </div> 170 </div>
169 </div> 171 </div>