grossmj 426c16e296 Merge branch '2.2' into 3.0 ... # Conflicts: # .github/workflows/testing.yml # CHANGELOG # appveyor.yml # dev-requirements.txt # gns3server/controller/compute.py # gns3server/crash_report.py # gns3server/version.py # gns3server/web/route.py # pytest.ini # requirements.txt # tests/compute/dynamips/test_dynamips_router.py # tests/compute/test_base_node.py # tests/compute/vmware/test_vmware_manager.py # tests/compute/vmware/test_vmware_vm.py # tests/controller/gns3vm/test_virtualbox_gns3_vm.py		2022-08-30 11:53:12 +02:00
..
api	Use default symbol theme if none is provided when loading appliances	2022-07-25 20:39:03 +02:00
appliances	Update appliance files	2022-08-28 22:51:26 +02:00
compute	Merge branch '2.2' into 3.0	2022-08-30 11:53:12 +02:00
configs	New VPCS base config. Fixes #786.	2017-06-28 17:40:54 +08:00
controller	Merge branch '2.2' into 3.0	2022-08-30 11:53:12 +02:00
core	Fix merge error	2022-04-18 17:18:30 +07:00
db	Optionally allow Qemu raw images	2022-07-22 12:39:52 +02:00
schemas	Require name for custom adapters. Fixes #2098	2022-08-28 17:33:33 +02:00
services	Use generic symbol names	2022-07-25 12:33:40 +02:00
static	Bundle gns3-web-ui v3.0.0a1	2022-08-04 11:12:42 +02:00
symbols	Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232	2021-09-20 17:46:19 +09:30
templates	Move to version 3 of the REST API.	2020-11-02 12:05:32 +10:30
utils	Optionally allow Qemu raw images	2022-07-22 12:39:52 +02:00
web	Merge branch '2.2' into 3.0	2022-08-30 11:53:12 +02:00
__init__.py	Use pyupgrade with --py36-plus param.	2021-04-13 18:37:58 +09:30
__main__.py	Allow to start server with python -m gns3server	2015-08-25 22:31:45 +02:00
config.py	Drop Windows support	2022-01-19 22:28:36 +10:30
crash_report.py	Release v2.2.34	2022-08-28 23:28:12 +02:00
logger.py	Drop Windows support	2022-01-19 22:28:36 +10:30
main.py	Drop Windows support	2022-01-19 22:28:36 +10:30
server.py	Backward compatibility for --log argument	2022-04-27 14:15:29 +07:00
version.py	Development on 2.2.35dev1	2022-08-29 11:14:44 +02:00