Skip to content

Commit

Permalink
Merge branch '0.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Jul 21, 2016
2 parents 2015e64 + e2c2e71 commit ad13b7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CHANGES

- Suppress CancelledError when Timeout raises TimeoutError #970

- Don't expose `aiohttp.__version__`

0.22.1 (07-16-2016)
-------------------

Expand Down
4 changes: 2 additions & 2 deletions aiohttp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This relies on each of the submodules having an __all__ variable.

__version__ = '0.22.1'
__version__ = '0.22.2b0'

import multidict # noqa

Expand Down Expand Up @@ -30,4 +30,4 @@
multidict.__all__ + # noqa
multipart.__all__ + # noqa
websocket_client.__all__ + # noqa
('hdrs', '__version__', 'FileSender'))
('hdrs', 'FileSender'))

0 comments on commit ad13b7f

Please sign in to comment.