Merge branch 'master' into hotfix/avatars-with-email-master

maxceem · maxceem · commit ace8c3ceb06f · 2019-02-12T19:08:46.000+08:00
# Conflicts:
#	src/projects/create/components/FillProjectDetails.js
diff --git a/src/projects/create/components/FillProjectDetails.js b/src/projects/create/components/FillProjectDetails.js
@@ -37,7 +37,7 @@ class FillProjectDetails extends Component  {
   }
 
   render() {
-    const { project, processing, submitBtnText, onBackClick, projectTemplates, dirtyProject, /* templates,*/ productTemplates } = this.props
+    const { project, processing, submitBtnText, onBackClick, projectTemplates, dirtyProject, productTemplates } = this.props
     const projectTemplateId = _.get(project, 'templateId')
     const projectTemplate = _.find(projectTemplates, { id: projectTemplateId })
     const formDisclaimer = _.get(projectTemplate, 'scope.formDisclaimer')

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class FillProjectDetails extends Component {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`render() {`
`40`		`- const { project, processing, submitBtnText, onBackClick, projectTemplates, dirtyProject, /* templates,*/ productTemplates } = this.props`
	`40`	`+ const { project, processing, submitBtnText, onBackClick, projectTemplates, dirtyProject, productTemplates } = this.props`
`41`	`41`	`const projectTemplateId = _.get(project, 'templateId')`
`42`	`42`	`const projectTemplate = _.find(projectTemplates, { id: projectTemplateId })`
`43`	`43`	`const formDisclaimer = _.get(projectTemplate, 'scope.formDisclaimer')`