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

This commit is contained in:
yflory 2018-12-11 12:04:29 +01:00
commit cc6ffcc788
2 changed files with 2 additions and 2 deletions

View File

@ -91,7 +91,7 @@ define([
]) ])
]) ])
]), ]),
h('div.cp-version-footer', "CryptPad v2.13.0 (Numbat)") h('div.cp-version-footer', "CryptPad v2.14.0 (Opossum)")
]); ]);
}; };

View File

@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "2.13.0", "version": "2.14.0",
"license": "AGPL-3.0+", "license": "AGPL-3.0+",
"repository": { "repository": {
"type": "git", "type": "git",