Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
felipelerena committed Jul 25, 2015
2 parents 62d47fc + bcf44fe commit 7e3a04b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
# built documents.
#
# The short X.Y version.
version = '0.9'
version = '0.12'
# The full version, including alpha/beta/rc tags.
release = '0.9'
release = '0.12'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name='Touchandgo',
version='0.11.0',
version='0.12.0',
author='Felipe Lerena, Nicolás Demarchi',
description='A python app and library to watch series magically',
author_email='felipelerena@gmail.com - mail@gilgamezh.me',
Expand Down

0 comments on commit 7e3a04b

Please sign in to comment.