Commits

Maximiliano Garcia committed ddc0a0054b3M
Merge branch 'develop' into feature/geozones # Conflicts: # src/settings/components/SaveSettings/SaveSettings.component.jsx # src/settings/sagas/save.js
Merge branch 'develop' into feature/geozones # Conflicts: # src/settings/components/SaveSettings/SaveSettings.component.jsx # src/settings/sagas/save.js