Merge branch 'release/0.29.2'

conan-io · Dec 2, 2017 · ab34eea · ab34eea
2 parents 4f92f62 + 231882b
commit ab34eea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conans/__init__.py b/conans/__init__.py
@@ -16,5 +16,5 @@
 COMPLEX_SEARCH_CAPABILITY = "complex_search"
 SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]
 
-__version__ = '0.29.1'
+__version__ = '0.29.2'
 
diff --git a/conans/requirements_osx.txt b/conans/requirements_osx.txt
@@ -1,4 +1,4 @@
-cryptography>=1.3.4, <2.0.0
+cryptography>=1.3.4, <2.2.0
 pyOpenSSL>=16.0.0, <18.0.0
 ndg-httpsclient>=0.4.1, <0.5.0
 pyasn>=1.5.0b7, <1.6.0