trilium

mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00

History

zadam 93addac8bb Merge branch 'master' into next61

# Conflicts:
#	src/becca/entities/bnote.js
#	src/public/app/components/note_context.js
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/services/note_content_renderer.js
#	src/public/app/services/utils.js
#	src/public/app/widgets/ribbon_widgets/file_properties.js
#	src/public/app/widgets/ribbon_widgets/note_info_widget.js
#	src/services/notes.js

2023-06-05 00:09:55 +02:00

becca

Merge branch 'master' into next61

2023-06-05 00:09:55 +02:00

errors

introduced new exception classes for structured error reporting

2022-12-09 16:04:13 +01:00

etapi

Merge branch 'master' into next61

2023-06-05 00:09:55 +02:00

public

Merge branch 'master' into next61