zadam c16f7a5e02 Merge branch 'master' into next55 ...

# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js

2022-10-15 12:09:25 +02:00

..

attribute_detail.js

Merge branch 'stable'

2022-10-15 12:03:03 +02:00

attribute_editor.js

Merge branch 'master' into next55

2022-10-15 12:09:25 +02:00