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

pull/1/head
yflory 7 years ago
commit b0a384e8e0

@ -1,7 +1,7 @@
define([ define([
'jquery', 'jquery',
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
'/common/sframe-chainpad-listmap.js', '/bower_components/chainpad-listmap/chainpad-listmap.js',
'/common/toolbar3.js', '/common/toolbar3.js',
'/bower_components/nthen/index.js', '/bower_components/nthen/index.js',
'/common/sframe-common.js', '/common/sframe-common.js',

Loading…
Cancel
Save