diff options
author | 2019-04-12 19:05:59 +0200 | |
---|---|---|
committer | 2019-04-12 19:05:59 +0200 | |
commit | 821a3192801eb86a06373054e90150f73473d30c (patch) | |
tree | f7f3417d05108787636fbe8371f3babb40fe47f3 /src/actions/index.js | |
parent | add locale on signup (diff) | |
parent | link to in-app changelog on new update notification (diff) | |
download | ferdium-app-821a3192801eb86a06373054e90150f73473d30c.tar.gz ferdium-app-821a3192801eb86a06373054e90150f73473d30c.tar.zst ferdium-app-821a3192801eb86a06373054e90150f73473d30c.zip |
Merge branch 'feature/announcements' into develop
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 00f843cd6..fc525afeb 100644 --- a/src/actions/index.js +++ b/src/actions/index.js | |||
@@ -11,6 +11,7 @@ import payment from './payment'; | |||
11 | import news from './news'; | 11 | 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 workspaces from '../features/workspaces/actions'; | 15 | import workspaces from '../features/workspaces/actions'; |
15 | 16 | ||
16 | const actions = Object.assign({}, { | 17 | const actions = Object.assign({}, { |
@@ -28,5 +29,6 @@ const actions = Object.assign({}, { | |||
28 | 29 | ||
29 | export default Object.assign( | 30 | export default Object.assign( |
30 | defineActions(actions, PropTypes.checkPropTypes), | 31 | defineActions(actions, PropTypes.checkPropTypes), |
32 | { announcements }, | ||
31 | { workspaces }, | 33 | { workspaces }, |
32 | ); | 34 | ); |