diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
| commit | ea50f55148f059549a586fb136eaa62963e33e66 (patch) | |
| tree | c8178a76a0f7a5cf4817abeae8ab263375683e6d /src/boot | |
| parent | 72749834f3c82847dd8b584cb0e0622a25f292f8 (diff) | |
| parent | 3870adf51ff736617f48619d16553010d5e9c9b0 (diff) | |
Merge branch 'develop' into 'masto-api/direct'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/boot')
| -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({ |