diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-11 12:00:07 +0200 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-11 12:00:07 +0200 |
commit | e43d6bd80b3d76aae627fa8174eea98c14016549 (patch) | |
tree | de1d0a3ba10100ce68d0cb1ed618095e362fe573 /src/actions/index.js | |
parent | implements basic release announcement feature (diff) | |
parent | handle deleted services that are attached to workspaces (diff) | |
download | ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.tar.gz ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.tar.zst ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.zip |
merge-in workspace feature
Diffstat (limited to 'src/actions/index.js')
-rw-r--r-- | src/actions/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/actions/index.js b/src/actions/index.js index dc1d3b6b2..fc525afeb 100644 --- a/src/actions/index.js +++ b/src/actions/index.js | |||
@@ -12,6 +12,7 @@ import news from './news'; | |||
12 | import settings from './settings'; | 12 | import settings from './settings'; |
13 | import requests from './requests'; | 13 | import requests from './requests'; |
14 | import announcements from '../features/announcements/actions'; | 14 | import announcements from '../features/announcements/actions'; |
15 | import workspaces from '../features/workspaces/actions'; | ||
15 | 16 | ||
16 | const actions = Object.assign({}, { | 17 | const actions = Object.assign({}, { |
17 | service, | 18 | service, |
@@ -29,4 +30,5 @@ const actions = Object.assign({}, { | |||
29 | export default Object.assign( | 30 | export default Object.assign( |
30 | defineActions(actions, PropTypes.checkPropTypes), | 31 | defineActions(actions, PropTypes.checkPropTypes), |
31 | { announcements }, | 32 | { announcements }, |
33 | { workspaces }, | ||
32 | ); | 34 | ); |