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
..
2020-06-20 12:31:38 +02:00
2023-05-29 00:19:54 +02:00
2021-06-29 22:15:57 +02:00
2023-05-09 00:05:27 +02:00
2022-12-21 16:11:00 +01:00
2023-03-06 21:28:09 +08:00
2023-04-15 00:06:13 +02:00
2023-01-03 21:30:49 +01:00
2023-05-09 00:05:27 +02:00
2022-12-01 16:22:04 +01:00
2023-06-05 00:09:55 +02:00
2023-04-14 16:49:06 +02:00
2023-02-13 16:22:34 +01:00
2021-12-29 23:37:12 +01:00
2023-05-08 00:02:08 +02:00
2023-01-06 20:31:55 +01:00