web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
ansuz
2017-05-26 12:44:58 +02:00
parent a04f179d8b 57017c68fa
commit 3f3d64992d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/fsStore.js
View File

@@ -175,9 +175,7 @@ define([
// copy User_hash into sessionStorage because cross-domain iframes // copy User_hash into sessionStorage because cross-domain iframes
// on safari replaces localStorage with sessionStorage or something // on safari replaces localStorage with sessionStorage or something
if (sessionStorage) { if (sessionStorage) { sessionStorage.setItem('User_hash', localStorage.getItem('User_hash')); }
sessionStorage.setItem('User_hash', localStorage.getItem('User_hash'));
}
var localToken = tryParsing(localStorage.getItem(tokenKey)); var localToken = tryParsing(localStorage.getItem(tokenKey));
if (localToken === null) { if (localToken === null) {