Merge branch 'master' into development

cmlccie · cmlccie · commit 4b4c6f803d93 · 2016-09-16T16:45:42.000-04:00
diff --git a/setup.py b/setup.py
@@ -48,6 +48,6 @@
 
     keywords='cisco spark api enterprise messaging',
 
-    packages=['ciscosparkapi'],
+    packages=['ciscosparkapi', 'ciscosparkapi.api'],
     install_requires=['requests>=2.4.2'],
 )

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@`
`48`	`48`
`49`	`49`	`keywords='cisco spark api enterprise messaging',`
`50`	`50`
`51`		`- packages=['ciscosparkapi'],`
	`51`	`+ packages=['ciscosparkapi', 'ciscosparkapi.api'],`
`52`	`52`	`install_requires=['requests>=2.4.2'],`
`53`	`53`	`)`