Merge branch 'dev-2.x'

# Conflicts:
#	aiogram/__init__.py
This commit is contained in:
Alex Root Junior 2020-11-08 18:26:37 +02:00
commit dc235c66c2
58 changed files with 2939 additions and 1242 deletions

View file

@ -57,12 +57,13 @@ setup(
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Software Development :: Libraries :: Application Frameworks',
],
install_requires=[
'aiohttp>=3.5.4,<4.0.0',
'Babel>=2.6.0',
'certifi>=2019.3.9',
'aiohttp>=3.7.2,<4.0.0',
'Babel>=2.8.0',
'certifi>=2020.6.20',
],
extras_require={
'proxy': [