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/version.py
#	requirements.txt
This commit is contained in:
grossmj committed 2018-06-04 22:46:52 +07:00
2 parents 21a1800edc 051eedb406
commit d1ccf3bc84
24 files changed
+549 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1
View File
@@ -40,6 +40,7 @@ nosetests.xml
.project
.pydevproject
.settings
.vscode
# Pycharm
.idea