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

This commit is contained in:
yflory
2019-09-03 17:05:23 +02:00
21 changed files with 256 additions and 473 deletions

View File

@@ -1,6 +1,5 @@
define([
'/bower_components/chainpad-crypto/crypto.js',
'/common/curve.js',
'/common/common-hash.js',
'/common/common-util.js',
'/common/common-realtime.js',
@@ -8,8 +7,10 @@ define([
'/customize/messages.js',
'/bower_components/nthen/index.js',
], function (Crypto, Curve, Hash, Util, Realtime, Constants, Messages, nThen) {
], function (Crypto, Hash, Util, Realtime, Constants, Messages, nThen) {
'use strict';
var Curve = Crypto.Curve;
var Msg = {
inputs: [],
};