Merge branch 'develop' into 'mastoapi/public-tl'

# Conflicts:
#   src/services/api/api.service.js

1 files changed, 0 insertions, 9 deletions

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index e828a74b..720ff706 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -60,15 +60,6 @@ export default function createPersistedState ({
             merge({}, store.state, savedState)
           )
         }
-        if (store.state.config.customTheme) {
-          // This is a hack to deal with async loading of config.json and themes
-          // See: style_setter.js, setPreset()
-          window.themeLoaded = true
-          store.dispatch('setOption', {
-            name: 'customTheme',
-            value: store.state.config.customTheme
-          })
-        }
         if (store.state.oauth.token) {
           store.dispatch('loginUser', store.state.oauth.token)
         }