grossmj 7ac3a628a4 Merge remote-tracking branch 'origin/master' into master-3.0 ... # Conflicts: # angular.json # package.json # src/ReleaseNotes.txt # src/app/cartography/helpers/font-fixer.spec.ts # src/app/cartography/models/node.ts # src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html # src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts # src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts # src/app/components/project-map/project-map-menu/project-map-menu.component.ts # src/app/components/project-map/project-map.component.html # src/app/components/project-map/project-map.component.ts # src/app/components/projects/projects.component.html # src/app/components/settings/settings.component.html # src/app/components/settings/settings.component.spec.ts # src/app/components/template/template-list-dialog/template-list-dialog.component.html # src/app/components/template/template.component.html # src/app/components/template/template.component.ts # src/app/services/link.service.ts # yarn.lock		2023-02-01 10:32:12 +08:00
..
workflows	Merge remote-tracking branch 'origin/master' into master-3.0	2023-02-01 10:32:12 +08:00