Merge branch 'develop' into fix/subscription-info-display

app/assets/javascripts/directives/views/revisionPreviewModal.ts

@@ -102,7 +102,7 @@ class RevisionPreviewModalCtrl extends PureViewCtrl implements RevisionPreviewSc
         });
       } else {
         this.application.changeAndSaveItem(this.uuid, (mutator) => {
-          mutator.setContent(this.content);
+          mutator.unsafe_setCustomContent(this.content);
         }, true, PayloadSource.RemoteActionRetrieved);
       }
       this.dismiss();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.8.22",
+  "version": "3.8.25",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -73,7 +73,7 @@
     "@reach/listbox": "^0.16.1",
     "@standardnotes/features": "1.6.1",
     "@standardnotes/sncrypto-web": "1.5.2",
-    "@standardnotes/snjs": "2.14.11",
+    "@standardnotes/snjs": "2.14.13",
     "mobx": "^6.3.2",
     "mobx-react-lite": "^3.2.0",
     "preact": "^10.5.12",

yarn.lock

@@ -2149,10 +2149,10 @@
     "@standardnotes/sncrypto-common" "^1.5.2"
     libsodium-wrappers "^0.7.8"
 
-"@standardnotes/snjs@2.14.11":
-  version "2.14.11"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.14.11.tgz#e80a23df763c44d463fe6b73ea0b12522afad9e7"
-  integrity sha512-L33rhU/NK2ev+o8QXWbVT7jZtVwIwvNwT46N/3Lv5RQXkY7wa1yxO08NHt4BfHqrmXI3mF5qnBH3mcYoOtBY7A==
+"@standardnotes/snjs@2.14.13":
+  version "2.14.13"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.14.13.tgz#791935559538bf51484159d87651b667dc2dcebd"
+  integrity sha512-nLmP8BvN8zqc7i6mspr2UKhGxdHFZhW0+uUbGu3yjLiMAnfQpxx8pLP9uWdshx+5Cc8cCzCBq+ekA0OZt4UK3Q==
   dependencies:
     "@standardnotes/auth" "3.7.2"
     "@standardnotes/common" "1.2.0"