Big manual merge

This commit is contained in:
Caleb James DeLisle
2017-08-04 11:20:17 +02:00
71 changed files with 3489 additions and 1004 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"chainpad-server": "^1.0.1",
"express": "~4.10.1",