aboutsummaryrefslogtreecommitdiffstats
path: root/src/actions/index.js
diff options
context:
space:
mode:
authorLibravatar Stefan <stefan@adlk.io>2019-06-04 14:26:56 +0200
committerLibravatar Stefan <stefan@adlk.io>2019-06-04 14:26:56 +0200
commitfd6a1e9ba24c7947af08a30829c860cad4726f67 (patch)
tree0b6276700ced8d13eaf0a1e3b706a69a5a47b1da /src/actions/index.js
parentfix(Windows): Replace tray icon with high-res version (diff)
parentMerge pull request #1443 from meetfranz/feature/multilingual-announcements (diff)
downloadferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.gz
ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.zst
ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.zip
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
Diffstat (limited to 'src/actions/index.js')
-rw-r--r--src/actions/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/actions/index.js b/src/actions/index.js
index 00f843cd6..fc525afeb 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,6 +11,7 @@ import payment from './payment';
11import news from './news'; 11import news from './news';
12import settings from './settings'; 12import settings from './settings';
13import requests from './requests'; 13import requests from './requests';
14import announcements from '../features/announcements/actions';
14import workspaces from '../features/workspaces/actions'; 15import workspaces from '../features/workspaces/actions';
15 16
16const actions = Object.assign({}, { 17const actions = Object.assign({}, {
@@ -28,5 +29,6 @@ const actions = Object.assign({}, {
28 29
29export default Object.assign( 30export default Object.assign(
30 defineActions(actions, PropTypes.checkPropTypes), 31 defineActions(actions, PropTypes.checkPropTypes),
32 { announcements },
31 { workspaces }, 33 { workspaces },
32); 34);