Merge branch 'soon' into staging

2017-02-13 11:59:49 +01:00
parent 2807ad9dc3 a995df25f6
commit 2851ceb95a
2 changed files with 3 additions and 3 deletions
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -404,7 +404,7 @@ define([
                crypto: Crypto.createEncryptor(secret.keys),

                // really basic operational transform
-                transformFunction : JsonOT.transform || JsonOT.validate,
+                transformFunction : JsonOT.validate,

                // cryptpad debug logging (default is 1)
                // logLevel: 0,