Merge branch 'master' into feature/messageEditDelete

gondzo · web-flow · commit f1dd4cadb3d4 · 2017-07-13T17:40:50.000+02:00
diff --git a/src/projects/reducers/project.js b/src/projects/reducers/project.js
@@ -1,3 +1,4 @@
+import { unflatten } from 'flat'
 import {
   LOAD_PROJECT_PENDING, LOAD_PROJECT_SUCCESS, LOAD_PROJECT_FAILURE, LOAD_DIRECT_PROJECT_SUCCESS,
   CREATE_PROJECT_PENDING, CREATE_PROJECT_SUCCESS, CREATE_PROJECT_FAILURE, CLEAR_LOADED_PROJECT,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { unflatten } from 'flat'`
`1`	`2`	`import {`
`2`	`3`	`LOAD_PROJECT_PENDING, LOAD_PROJECT_SUCCESS, LOAD_PROJECT_FAILURE, LOAD_DIRECT_PROJECT_SUCCESS,`
`3`	`4`	`CREATE_PROJECT_PENDING, CREATE_PROJECT_SUCCESS, CREATE_PROJECT_FAILURE, CLEAR_LOADED_PROJECT,`