Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-14 01:05:49 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'stable' into next61

Browse Source 
# Conflicts:
#	src/etapi/etapi.openapi.yaml
#	src/etapi/notes.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/app_info.js
This commit is contained in:
zadam
2023-06-20 23:30:45 +02:00
parent 1f3b6feaff 8095c77b91
commit 995f1c9fc4
12 changed files with 86 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/app_info.js
View File

@@ -4,7 +4,7 @@ const build = require('./build');
const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir');
const APP_DB_VERSION = 221;
const APP_DB_VERSION = 222;
const SYNC_VERSION = 30;
const CLIPPER_PROTOCOL_VERSION = "1.0";