Merge branch 'staging' into socketio

This commit is contained in:
yflory
2018-06-21 14:01:56 +02:00
69 changed files with 4655 additions and 2714 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "2.2.0",
"version": "2.3.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"chainpad-server": "^2.0.0",