Merge branch 'master' into 'py3'
# Conflicts: # requirements.txt
... | ... | @@ -10,7 +10,7 @@ pycparser>=2.10 |
singledispatch>=3.4.0.0 | ||
six>=1.8.0 | ||
tornado==4.4.2 | ||
ansible==2.8.8 | ||
ansible==2.9.6 | ||
setuptools>=11.3 | ||
packaging | ||
appdirs | ||
... | ... |
Please register or sign in to comment