mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-01-06 04:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2019-08-15 08:52:34 +02:00
parent 963ed32ce4 5406b09f3a
commit 61520bc3b3
14 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -2,7 +2,7 @@
"name": "trilium",
"productName": "Trilium Notes",
"description": "Trilium Notes",
"version": "0.34.2",
"version": "0.34.3",
"license": "AGPL-3.0-only",
"main": "electron.js",
"bin": {
@@ -78,7 +78,7 @@
},
"devDependencies": {
"devtron": "1.4.0",
"electron": "6.0.1",
"electron": "6.0.2",
"electron-builder": "21.2.0",
"electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0",