Merge branch 'release/3.6.1' into develop

app/assets/javascripts/services/bridge.ts

@@ -18,5 +18,5 @@ export interface Bridge {
   onMajorDataChange(): void;
   onInitialDataLoad(): void;
   onSearch(text?: string): void;
-  downloadBackup(): Promise<void>;
+  downloadBackup(): void | Promise<void>;
 }

app/assets/javascripts/ui_models/application.ts

@@ -156,7 +156,7 @@ export class WebApplication extends SNApplication {
     this.applicationElement.append(el);
   }
 
-  downloadBackup(): Promise<void> {
+  downloadBackup(): void | Promise<void> {
     return this.bridge.downloadBackup();
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",