Merge remote-tracking branch 'upstream/master' into fix/remove-componentWillUpdate

Conflicts:
	src/components/map/MapboxGlMap.jsx
	src/components/modals/ExportModal.jsx
This commit is contained in:
orangemug
2018-09-10 14:46:52 +01:00
43 changed files with 277 additions and 502 deletions

View File

@@ -53,12 +53,8 @@ export default class ZoomProperty extends React.Component {
]),
}
constructor() {
super()
this.state = {
refs: {}
}
state = {
refs: {}
}
componentDidMount() {