aboutsummaryrefslogtreecommitdiffstats
path: root/src/actions/index.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-04-13 20:58:37 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-04-13 20:58:37 +0200
commit8e623e84cf21068561217a509c0761d524dfbc29 (patch)
treea83f307c3ce087169e3a1d55418fa78a71b7b4dc /src/actions/index.js
parentUse store reactions (diff)
parentMerge branch 'feature/announcements' into develop (diff)
downloadferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.tar.gz
ferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.tar.zst
ferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.zip
Merge branch 'develop' into chore/streamline-dashboard
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);