Merge branch 'develop'

jcnelson · jcnelson · commit 3af223d147c7 · 2016-09-29T23:29:13.000-04:00
diff --git a/blockstack_gpg/version.py b/blockstack_gpg/version.py
@@ -1 +1 @@
-__version__ = '0.0.13.0'
+__version__ = '0.14.0'
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 from setuptools import setup, find_packages
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/python`
	`1`	`+#!/usr/bin/env python`
`2`	`2`
`3`	`3`	`from setuptools import setup, find_packages`
`4`	`4`