Merge branch 'development' of github.com:Lukasa/hyper into development

Lukasa · Lukasa · commit 941036be8606 · 2015-10-29T09:27:31.000+09:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst hyper/certs.pem
+include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst hyper/certs.pem tox.ini
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst hyper/certs.pem`
	`1`	`+include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst hyper/certs.pem tox.ini`
`2`	`2`