diff options
| author | dave <starpumadev@gmail.com> | 2019-03-27 16:41:05 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-27 16:41:05 -0400 |
| commit | 30084a120470b6220f684ebaed1a196e68ba8188 (patch) | |
| tree | 3bef78d0a87c03df813d5910aca6a16af76ba61d /src/boot/after_store.js | |
| parent | 578b412177495af4376dbcbcbeac85bc6cb99432 (diff) | |
| parent | aed0943678ffb96df0c281a7edbba63aaa6578e8 (diff) | |
merge develop and resolve conflict
Diffstat (limited to 'src/boot/after_store.js')
| -rw-r--r-- | src/boot/after_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index f5e84cbc..f5add8ad 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -241,7 +241,7 @@ const afterStoreSetup = async ({ store, i18n }) => { // Now we have the server settings and can try logging in if (store.state.oauth.token) { - store.dispatch('loginUser', store.state.oauth.token) + await store.dispatch('loginUser', store.state.oauth.token) } const router = new VueRouter({ |