Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
30beec0102
@ -268,7 +268,9 @@ define([
|
|||||||
proxy[Constants.displayNameKey] = uname;
|
proxy[Constants.displayNameKey] = uname;
|
||||||
}
|
}
|
||||||
LocalStore.eraseTempSessionValues();
|
LocalStore.eraseTempSessionValues();
|
||||||
proceed(result);
|
LocalStore.login(result.userHash, result.userName, function () {
|
||||||
|
setTimeout(function () { proceed(result); });
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user