aboutsummaryrefslogtreecommitdiffstats
path: root/src/actions/index.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-09-03 20:33:00 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-09-03 20:33:00 +0200
commit3ca3e36cf7fce6b241e242a07cb4731760ee4265 (patch)
tree0796a3712aebbf695545892be19fc677e7acec8e /src/actions/index.js
parentAutomatic i18n update (i18n.meetfranz.com) (diff)
parentUpdate en-US.json (diff)
downloadferdium-app-3ca3e36cf7fce6b241e242a07cb4731760ee4265.tar.gz
ferdium-app-3ca3e36cf7fce6b241e242a07cb4731760ee4265.tar.zst
ferdium-app-3ca3e36cf7fce6b241e242a07cb4731760ee4265.zip
Merge branch 'develop' into i18n
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 fc525afeb..336344d76 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -13,6 +13,7 @@ import settings from './settings';
13import requests from './requests'; 13import requests from './requests';
14import announcements from '../features/announcements/actions'; 14import announcements from '../features/announcements/actions';
15import workspaces from '../features/workspaces/actions'; 15import workspaces from '../features/workspaces/actions';
16import todos from '../features/todos/actions';
16 17
17const actions = Object.assign({}, { 18const actions = Object.assign({}, {
18 service, 19 service,
@@ -31,4 +32,5 @@ export default Object.assign(
31 defineActions(actions, PropTypes.checkPropTypes), 32 defineActions(actions, PropTypes.checkPropTypes),
32 { announcements }, 33 { announcements },
33 { workspaces }, 34 { workspaces },
35 { todos },
34); 36);