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 remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
This commit is contained in:
zadam
2021-08-23 22:27:19 +02:00
parent 8cb07525cf 06eb0ce910
commit 0ee093f038
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-server.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=14.17.1
NODE_VERSION=14.17.5
if [ "$1" != "DONTCOPY" ]
then