Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
davidsulpy committed Feb 8, 2016
2 parents 88ce378 + 7476e14 commit bcebb4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ python:
- 3.5
- nightly
install: true
script: echo hello
deploy:
provider: pypi
user: davidsulpy
Expand Down
2 changes: 1 addition & 1 deletion ISStreamer/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.0.dev0'
__version__ = '0.1.0'

0 comments on commit bcebb4c

Please sign in to comment.