diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-06-21 12:22:28 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-06-21 12:22:28 -0400 |
| commit | 937705ccb0b53f22e9e5e3397a0d03142142d8c6 (patch) | |
| tree | 4d617491309a5b4868efb4d12854f6329fbc6dc0 /src/modules/users.js | |
| parent | e113d0a250d914fa490e632e21abd53206e6482e (diff) | |
| parent | 1a5ee95ee4e7b739158bc7571b01b32b1af792ad (diff) | |
Merge branch 'feature/registration' into 'develop'
Add a registration form.
See merge request !76
Diffstat (limited to 'src/modules/users.js')
| -rw-r--r-- | src/modules/users.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/users.js b/src/modules/users.js index 22e0133c..b68f67e6 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -24,7 +24,7 @@ export const mutations = { set(user, 'muted', muted) }, setCurrentUser (state, user) { - state.currentUser = user + state.currentUser = merge(state.currentUser || {}, user) }, beginLogin (state) { state.loggingIn = true |