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

2024-12-25 16:28:11 +00:00 · 2018-01-24 10:55:08 +01:00 · 2018-01-24 10:55:08 +01:00 · 838d82a98b
commit 838d82a98b
parent 05983f2838 c532e6392d
2 changed files with 2 additions and 2 deletions
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -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
--- a/requirements.txt
+++ b/requirements.txt
@ -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