Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
Caleb James DeLisle 2017-12-12 14:50:23 +01:00
commit e8a0b4784d

View File

@ -150,6 +150,7 @@ define([
if (!secret.keys) { if (!secret.keys) {
isNewHash = false; isNewHash = false;
secret.keys = secret.key; secret.keys = secret.key;
readOnly = false;
} }
var parsed = Utils.Hash.parsePadUrl(window.location.href); var parsed = Utils.Hash.parsePadUrl(window.location.href);
if (!parsed.type) { throw new Error(); } if (!parsed.type) { throw new Error(); }