2
0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 21:07:59 +00:00

Merge branch 'develop' into asyncio-dev

# Conflicts:
#	pyrogram/__init__.py
This commit is contained in:
Dan 2020-04-30 11:55:03 +02:00
commit 45c6df45e9
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
__version__ = "0.17.0-asyncio" __version__ = "0.17.0-async"
__license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)" __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
__copyright__ = "Copyright (C) 2017-2020 Dan <https://github.com/delivrance>" __copyright__ = "Copyright (C) 2017-2020 Dan <https://github.com/delivrance>"

View File

@ -307,7 +307,7 @@ class Message(Object, Update):
contact: "pyrogram.Contact" = None, contact: "pyrogram.Contact" = None,
location: "pyrogram.Location" = None, location: "pyrogram.Location" = None,
venue: "pyrogram.Venue" = None, venue: "pyrogram.Venue" = None,
web_page: bool = None, web_page: "pyrogram.WebPage" = None,
poll: "pyrogram.Poll" = None, poll: "pyrogram.Poll" = None,
dice: "pyrogram.Dice" = None, dice: "pyrogram.Dice" = None,
new_chat_members: List[User] = None, new_chat_members: List[User] = None,