Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/services/app_info.js
This commit is contained in:
zadam
2021-11-24 20:08:34 +01:00
3 changed files with 3 additions and 3 deletions

View File

@@ -5,7 +5,7 @@ const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir');
const APP_DB_VERSION = 187;
const SYNC_VERSION = 21;
const SYNC_VERSION = 23;
const CLIPPER_PROTOCOL_VERSION = "1.0";
module.exports = {