aboutsummaryrefslogtreecommitdiffstats
path: root/src/actions/index.js
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-01 14:25:44 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-01 14:25:44 +0100
commit739ef2e8a2dec94c3e10c3d26d797fe759fac7aa (patch)
tree4a2e066bf8627249f803eee16ba8e73268127fbd /src/actions/index.js
parentfixes merge conflicts with latest develop (diff)
downloadferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.tar.gz
ferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.tar.zst
ferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.zip
finish workspaces mvp
Diffstat (limited to 'src/actions/index.js')
-rw-r--r--src/actions/index.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/actions/index.js b/src/actions/index.js
index 45e6da515..00f843cd6 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,7 +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 workspace from '../features/workspaces/actions'; 14import workspaces from '../features/workspaces/actions';
15 15
16const actions = Object.assign({}, { 16const actions = Object.assign({}, {
17 service, 17 service,
@@ -24,7 +24,9 @@ const actions = Object.assign({}, {
24 news, 24 news,
25 settings, 25 settings,
26 requests, 26 requests,
27 workspace,
28}); 27});
29 28
30export default defineActions(actions, PropTypes.checkPropTypes); 29export default Object.assign(
30 defineActions(actions, PropTypes.checkPropTypes),
31 { workspaces },
32);