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

pull/1/head
yflory 8 years ago
commit 85fe67618c

@ -32,7 +32,7 @@
"hyperjson": "~1.3.1", "hyperjson": "~1.3.1",
"textpatcher": "^1.3.0", "textpatcher": "^1.3.0",
"proxy-polyfill": "^0.1.5", "proxy-polyfill": "^0.1.5",
"chainpad": "^0.2.2", "chainpad": "^0.3.0",
"chainpad-json-validator": "^0.1.1", "chainpad-json-validator": "^0.1.1",
"chainpad-crypto": "^0.1.3", "chainpad-crypto": "^0.1.3",
"chainpad-listmap": "^0.2.0", "chainpad-listmap": "^0.2.0",

Loading…
Cancel
Save