Merge branch '2.0' into pr7268

Browse Source

# Conflicts:
#	discord/raw_models.py

...

This commit is contained in:

Arthur Jovart

2021-09-01 22:27:34 +02:00

parent e4750c7105 6f5614373a

commit c34612dd71

115 changed files with 5173 additions and 37532 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

639

discord/state.py

File diff suppressed because it is too large Load Diff