Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
Conflicts:
	fut14/__init__.py
	setup.py
  • Loading branch information
oczkers committed Feb 15, 2014
2 parents d43a1f1 + 0e9389a commit 6af9ad8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fut14/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"""

__title__ = 'fut14'
__version__ = '0.0.10'
__version__ = '0.0.11'
__author__ = 'Piotr Staroszczyk'
__author_email__ = 'piotr.staroszczyk@get24.org'
__license__ = 'GNU GPL v3'
Expand Down
1 change: 0 additions & 1 deletion fut14/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class Core(object):
def __init__(self, email, passwd, secret_answer, platform='pc', debug=False):
self.debug = debug
if self.debug: self.logger = logger('DEBUG')
else: self.logger = logger()
# TODO: validate fut request response (200 OK)
self.email = email
self.passwd = passwd
Expand Down
2 changes: 1 addition & 1 deletion setup.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


__title__ = 'fut14'
__version__ = '0.0.10'
__version__ = '0.0.11'
__author__ = 'Piotr Staroszczyk'
__author_email__ = 'piotr.staroszczyk@get24.org'
__license__ = 'GNU GPL v3'
Expand Down

0 comments on commit 6af9ad8

Please sign in to comment.