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

..

desktop_layout.js

Merge branch 'master' into next61

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

mobile_layout.js

small fixes

2022-12-14 12:26:04 +01:00