Merge branch 'master' into develop

# Conflicts:
#	package-lock.json
#	release-notes.md

app/scripts/comp/app/yubikey.js

@@ -241,7 +241,7 @@ const YubiKey = {
     getOtp(serial, entry, callback) {
         return Launcher.spawn({
             cmd: this.cmd(),
-            args: ['-d', serial, 'oath', 'code', '--single', entry],
+            args: ['-d', serial, 'oath', 'accounts', 'code', '--single', entry],
             noStdOutLogging: true,
             complete: (err, stdout) => {
                 if (err) {

build/tasks/grunt-electron-patch.js

@@ -5,7 +5,7 @@ module.exports = function (grunt) {
         for (const { src } of this.files) {
             for (const path of src) {
                 grunt.log.writeln(`Patching ${path}...`);
-                patch({ path, verbose: true });
+                patch({ path });
             }
         }
     });

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "KeeWeb",
-    "version": "1.17.4",
+    "version": "1.17.5",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "main.js",
     "homepage": "https://keeweb.info",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keeweb",
-    "version": "1.17.4",
+    "version": "1.17.5",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "Gruntfile.js",
     "private": true,

release-notes.md

@@ -4,10 +4,17 @@ Release notes
 `+` optimized memory consumption for large files  
 `+` option to use short-lived tokens in cloud storages  
 `+` opening XML and CSV files using the Open button  
-`-` ykman v4 support  
-`-` setting expiry date in the past
 `-` legacy auto-type removed  
+
+##### v1.17.5 (2021-03-27)
+`+` ykman v4 support  
+`+` fix #1725: setting expiry date in the past  
 `-` fix #1762: line breaks in Markdown notes  
+`-` fix #1734: overlapping generator icon on password inputs  
+`-` fix #1758: export format HTML issues  
+`-` fix #1755: calendar tooltips in different time zones  
+`-` restored the missing local file icon on the open screen  
+`*` new Windows code signing certificate  
 
 ##### v1.17.4 (2021-03-18)
 `-` fix #1740: Windows updater issues