Merge branch 'master' into dev-1.x

# Conflicts:
#	aiogram/__init__.py
This commit is contained in:
Alex Root Junior 2018-05-04 14:08:31 +03:00
commit 6f9cc1cfc3

Diff content is not available