mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2024-12-22 06:17:47 +00:00
7ac3a628a4
# 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 |
||
---|---|---|
.. | ||
add-new-issues-to-project.yml | ||
codeql.yml | ||
main.yml |