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

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
This commit is contained in:
grossmj committed 2018-08-07 21:06:42 +07:00
2 parents 1cc1ccd511 12e71a2917
commit 033f005bde
402 files changed
+11042 -10444
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/documentation.sh
+1 -1
View File
@@ -28,7 +28,7 @@ export PYTEST_BUILD_DOCUMENTATION=1
rm -Rf docs/api/
mkdir -p docs/api/examples
py.test -v tests
py.test-3 -v tests
export PYTHONPATH=.
python3 gns3server/web/documentation.py