Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2

This commit is contained in:
ziajka committed 2018-01-24 10:55:08 +01:00
commit 838d82a98b
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
-rrequirements.txt
sphinx==1.6.2
sphinx==1.6.6
pytest==3.2.5
pep8==1.7.0
pytest-catchlog==1.2.2
+1 -1
View File
@@ -7,4 +7,4 @@ raven>=5.23.0
psutil>=3.0.0
zipstream>=1.1.4
typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
prompt-toolkit
prompt-toolkit==1.0.15