trilium

mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00

History

zadam 9e9fb2979f Merge branch 'master' into next61

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js

2023-05-20 20:55:57 +02:00

codeStyles

electron update

2020-11-10 22:54:03 +01:00

inspectionProfiles

eslint config

2023-04-09 23:08:24 +02:00

jsLinters

eslint config

2023-04-09 23:08:24 +02:00

.gitignore

more robust handling of sync error, fixes #830