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

4.4 KiB

Raw Blame History

View Raw