Merge branch 'dev' into dev-1.x

# Conflicts:
#	aiogram/__init__.py
#	aiogram/types/message.py
This commit is contained in:
Alex Root Junior 2017-10-19 00:39:00 +03:00
commit d9ffbb2896
2 changed files with 1 additions and 2 deletions

View file

@ -1,4 +1,4 @@
# from .bot import Bot
from .bot import Bot
from .utils.versions import Version, Stage
VERSION = Version(1, 0, 0, stage=Stage.DEV, build=0)

View file

@ -1,4 +1,3 @@
ujson
aiohttp>=2.1.0
appdirs>=1.4.3
async-timeout>=1.2.1