Permalink
Browse files

Merge branch 'master' of https://github.com/dustcloud/smartmeshsdk

Conflicts:
	README.md
  • Loading branch information...
twatteynelinear committed Jun 2, 2016
2 parents a414376 + a6b2922 commit dffbd1f5df91cb1132d36c91d393b4f77b71c304
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
@@ -7,4 +7,4 @@ Python SmartMesh SDK
* [Discussion](https://dustcloud.atlassian.net/wiki/questions)
* [Issue tracking](https://dustcloud.atlassian.net/browse/SMSDK)
For Windows executable versions of the applications, see [Releases](https://github.com/dustcloud/smartmeshsdk/releases)
For Windows executable versions of the applications, see [Releases](https://github.com/dustcloud/smartmeshsdk/releases)

0 comments on commit dffbd1f

Please sign in to comment.