NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 06:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	README.md
#	gns3server/compute/base_node.py
#	gns3server/compute/dynamips/__init__.py
#	gns3server/compute/dynamips/hypervisor.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/schemas/qemu_template.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.11410ae4eaf4d4c08cd0.js
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj committed 2023-03-17 17:44:32 +10:00
2 parents c33a13fd45 ceb8208002
commit 267c4cbbbb
175 files changed
+702 -287
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/sync_appliances.sh
+1 -3
View File
@@ -26,7 +26,5 @@ rm -Rf /tmp/gns3-registry
git clone https://github.com/GNS3/gns3-registry.git /tmp/gns3-registry
mv /tmp/gns3-registry/appliances gns3server/appliances
git add .
git add gns3server/appliances/*
git commit -m "Sync appliances"