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

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

Browse Source
This commit is contained in:
ansuz
2017-04-25 18:28:48 +02:00
parent 74bcec8b31 2a417ddae8
commit 12898b3358
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/cryptpad-common.js
View File

@@ -514,7 +514,7 @@ define([
if (p.type !== parsed.type) { return pad; }
var shouldUpdate = p.hash === parsed.hash;
var shouldUpdate = p.hash.replace(/\/$/, '') === parsed.hash.replace(/\/$/, '');
// Version 1 : we have up to 4 differents hash for 1 pad, keep the strongest :
// Edit > Edit (present) > View > View (present)