Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.4' into dev

pull/4037/head
Laurent Cozic 2020-11-27 12:43:40 +00:00
parent b77f868fc8 56605beea2
commit 0bc53dc063
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "1.4.13", "version": "1.4.15",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

7
packages/app-desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "1.4.13", "version": "1.4.15",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"private": true, "private": true,
@ -32,7 +32,7 @@
"build/images/*" "build/images/*"
], ],
"afterAllArtifactBuild": "./generateSha512.js", "afterAllArtifactBuild": "./generateSha512.js",
"asar": true, "asar": false,
"asarUnpack": "./node_modules/node-notifier/vendor/**", "asarUnpack": "./node_modules/node-notifier/vendor/**",
"win": { "win": {
"rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161", "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
@ -72,7 +72,8 @@
"artifactName": "${productName}Portable.${ext}" "artifactName": "${productName}Portable.${ext}"
}, },
"mac": { "mac": {
"icon": "../../Assets/macOs.icns" "icon": "../../Assets/macOs.icns",
"target": "dmg"
}, },
"linux": { "linux": {
"icon": "../../Assets/LinuxIcons", "icon": "../../Assets/LinuxIcons",