Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Romain Dorgueil
2017-12-02 18:24:56 +01:00
3 changed files with 12 additions and 13 deletions

View File

@ -3,7 +3,7 @@ appnope==0.1.0
bleach==2.1.1
decorator==4.1.2
entrypoints==0.2.3
html5lib==0.999999999
html5lib==1.0b10
ipykernel==4.6.1
ipython-genutils==0.2.0
ipython==6.2.1
@ -28,7 +28,7 @@ prompt-toolkit==1.0.15
ptyprocess==0.5.2
pygments==2.2.0
python-dateutil==2.6.1
pyzmq==16.0.3
pyzmq==17.0.0b3
qtconsole==4.3.1
simplegeneric==0.8.1
six==1.11.0