1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
gns3-server/gns3server/web
grossmj 9de13c570c Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
2018-10-04 15:44:13 +02:00
..
__init__.py New base server. 2015-01-13 17:05:26 -07:00
documentation.py Rebuild documentation 2016-08-15 12:11:36 +02:00
logger.py Filter /settings from log 2017-05-12 10:48:43 +02:00
response.py Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
route.py Merge branch '2.1' into 2.2 2018-10-04 15:44:13 +02:00
web_server.py Merge branch '2.1' into 2.2 2018-10-04 15:44:13 +02:00