Merge branch 'master' into develop

This commit is contained in:
antelle 2017-12-11 21:51:15 +01:00
commit b2bf8685d8
4 changed files with 7 additions and 2 deletions

View File

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

View File

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

View File

@ -65,6 +65,8 @@ Section "MainSection" SEC01
SetOutPath "$INSTDIR"
SetOverwrite on
File /r "tmp\desktop\KeeWeb-win32-${arch}\*"
Delete "$INSTDIR\resources\app\*.*"
RMDir /r "$INSTDIR\resources\app"
CreateDirectory "$SMPROGRAMS\KeeWeb"
CreateShortCut "$SMPROGRAMS\KeeWeb\KeeWeb.lnk" "$INSTDIR\${PRODUCT_EXE}"
CreateShortCut "$DESKTOP\KeeWeb.lnk" "$INSTDIR\${PRODUCT_EXE}"

View File

@ -5,6 +5,9 @@ Release notes
`-` fixed calendar colors
`+` option to open a keyfile from command line
##### v1.6.3 (2017-12-11)
`-` fixed Windows installer upgrade issue
##### v1.6.2 (2017-12-09)
`+` Google Drive shared files support
`-` fixed Google Drive authentication issues