Merge branch 'development'

cmlccie · cmlccie · commit 5a72def5f9fb · 2016-09-24T00:08:41.000-04:00
diff --git a/setup.py b/setup.py
@@ -56,5 +56,5 @@
     keywords='cisco spark api enterprise messaging',
 
     packages=['ciscosparkapi', 'ciscosparkapi.api'],
-    install_requires=['requests>=2.4.2', 'six'],
+    install_requires=['requests>=2.4.2', 'six', 'future'],
 )

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@`
`56`	`56`	`keywords='cisco spark api enterprise messaging',`
`57`	`57`
`58`	`58`	`packages=['ciscosparkapi', 'ciscosparkapi.api'],`
`59`		`- install_requires=['requests>=2.4.2', 'six'],`
	`59`	`+ install_requires=['requests>=2.4.2', 'six', 'future'],`
`60`	`60`	`)`