Merge branch 'staging' into oo2

2018-09-25 11:19:52 -04:00
parent 855612e98b ad4e36015b
commit b181d72727
53 changed files with 4298 additions and 820 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.6.0",
+  "version": "2.8.0",
  "license": "AGPL-3.0+",
  "repository": {
    "type": "git",