grossmj 296446189f Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/appliances/Simulator.gns3a
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py

2021-12-02 19:57:04 +10:30

..

resources

Remove busybox and copy system busybox in setup.py

2021-08-11 17:27:47 +09:30

__init__.py

Merge branch '2.2' into 3.0

2021-12-02 19:57:04 +10:30

docker_error.py

Use pyupgrade with --py36-plus param.

2021-04-13 18:37:58 +09:30

docker_vm.py

Merge branch '2.2' into 3.0

2021-12-02 19:57:04 +10:30