Commit Graph

7 Commits

Author SHA1 Message Date
grossmj
267c4cbbbb Merge branch '2.2' into 3.0
# 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
2023-03-17 17:44:32 +10:00
grossmj
fb4c04ac41 Update documentation to install gns3-server. Fixes #2124 2023-01-17 09:45:14 +08:00
grossmj
78c301653f Convert README to Markdown 2023-01-10 08:23:06 +08:00
grossmj
3edfa53e9e Update README.md 2022-03-14 14:46:29 +10:30
grossmj
0a10b41418 Convert README to markdown 2022-03-13 15:44:26 +10:30
grossmj
c4ed47b2dc Initial project structure 2013-10-04 17:45:15 -06:00
grossmj
d1583e4a04 Initial commit 2013-09-25 19:45:09 -07:00