merge branch release/2.3.7

Closes #39.
textile · Mar 16, 2017 · f2a9408 · f2a9408
2 parents 56eee0f + 1fb0c90
commit f2a9408
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.textile b/CHANGELOG.textile
@@ -1,5 +1,8 @@
 h1. Textile Changelog
 
+h2. Version 2.3.7
+* Bugfix: Don't assume pytest is available to be imported in setup.py ("#39":https://github.com/textile/python-textile/issues/39)
+
 h2. Version 2.3.6
 * Packaging: @tests@ directory is correctly included in source-tarball. ("#33":https://github.com/textile/python-textile/issues/33)
 

diff --git a/textile/version.py b/textile/version.py
@@ -1 +1 @@
-VERSION = '2.3.6'
+VERSION = '2.3.7'