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

Merge branch 'master' into 3.0

Browse Source 
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
This commit is contained in:
grossmj committed 2021-04-10 12:46:40 +09:30
2 parents 31a1fdba68 4e61cc811e
commit 802959f9ab
41 files changed
+697 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/version.py
+1 -1
View File
@@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
__version__ = "3.0.0dev1"
__version__ = "3.0.0dev2"
__version_info__ = (3, 0, 0, 99)
if "dev" in __version__: