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:
yflory
2017-10-24 18:50:19 +02:00
parent f4adbd980e ba97aa7ad2
commit 24572a40d2
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/sframe-app-framework.js
View File

@@ -391,8 +391,7 @@ define([
// really basic operational transform
transformFunction: options.transformFunction || JsonOT.validate,
// This one causes a big mess.
//patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
// cryptpad debug logging (default is 1)
// logLevel: 0,