Alex Root Junior
|
87393f2475
|
Merge remote-tracking branch 'origin/dev-3.x' into dev-3.x
# Conflicts:
# README.md
# README.rst
# aiogram/__init__.py
# aiogram/bot/bot.py
# aiogram/contrib/fsm_storage/redis.py
# aiogram/contrib/middlewares/logging.py
# aiogram/dispatcher/dispatcher.py
# aiogram/dispatcher/filters/__init__.py
# aiogram/dispatcher/filters/builtin.py
# aiogram/dispatcher/filters/filters.py
# aiogram/dispatcher/filters/state.py
# aiogram/dispatcher/handler.py
# aiogram/dispatcher/webhook.py
# aiogram/types/base.py
# aiogram/types/chat.py
# aiogram/types/chat_member.py
# aiogram/types/input_media.py
# aiogram/types/message.py
# aiogram/utils/callback_data.py
# aiogram/utils/deprecated.py
# aiogram/utils/exceptions.py
# aiogram/utils/executor.py
# aiogram/utils/helper.py
# aiogram/utils/json.py
# aiogram/utils/mixins.py
# aiogram/utils/payload.py
# dev_requirements.txt
# docs/source/index.rst
# examples/callback_data_factory.py
# examples/check_user_language.py
# examples/echo_bot.py
# examples/finite_state_machine_example.py
# examples/i18n_example.py
# examples/inline_bot.py
# examples/media_group.py
# examples/middleware_and_antiflood.py
# examples/payments.py
# examples/proxy_and_emojize.py
# examples/regexp_commands_filter_example.py
# examples/throtling_example.py
# examples/webhook_example.py
# examples/webhook_example_2.py
# setup.py
# tests/test_bot.py
# tests/test_token.py
# tests/types/dataset.py
|
2019-11-03 22:19:44 +02:00 |
|
