Merge branch 'develop' into 'iss-149/profile-fields-setting'

# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue

1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index cad7ea25..8ecb66a8 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,13 +1,12 @@
 import merge from 'lodash.merge'
-import objectPath from 'object-path'
 import localforage from 'localforage'
-import { each } from 'lodash'
+import { each, get, set } from 'lodash'
 
 let loaded = false
 
 const defaultReducer = (state, paths) => (
   paths.length === 0 ? state : paths.reduce((substate, path) => {
-    objectPath.set(substate, path, objectPath.get(state, path))
+    set(substate, path, get(state, path))
     return substate
   }, {})
 )