Merge branch 'soon' into staging

customize.dist/pages.js

@@ -103,7 +103,7 @@ define([
                     ])*/
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v3.0.0 (Aurochs)")
+            h('div.cp-version-footer', "CryptPad v3.0.1 (Aurochs' revenge)")
         ]);
     };
 

package.json

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

readme.md

@@ -22,7 +22,7 @@ The most recent version and all past release notes can be found [here](https://g
 
 ## Setup using Docker
 
-See [Cryptpad-Docker](docs/cryptpad-docker.md) and the community wiki's [Docker](https://github.com/xwiki-labs/cryptpad/wiki/Docker-(with-Nginx-and-Traefik)) page for details on how to get up-and-running with Cryptpad in Docker.
+See [Cryptpad-Docker](docs/cryptpad-docker.md) and the community wiki's [Docker](https://github.com/xwiki-labs/cryptpad/wiki/Docker) page for details on how to get up-and-running with Cryptpad in Docker.
 
 ## Setup using Ansible
 

www/common/outer/onlyoffice.js

@@ -91,9 +91,9 @@ define([
 
             var hk = network.historyKeeper;
             var cfg = {
-                validateKey: obj.validateKey,
+                lastKnownHash: chan.lastKnownHash || chan.lastCpHash,
                 metadata: {
-                    lastKnownHash: chan.lastKnownHash || chan.lastCpHash,
+                    validateKey: obj.validateKey,
                     owners: obj.owners,
                     expire: obj.expire
                 }