iDutchy 2a32e56873 fix conflict

2021-06-25 20:33:22 -05:00

..

_static

conflict fixes

2021-01-14 18:03:09 -06:00

_templates

[matrix] Add scroll to top button

2021-01-12 02:34:54 -05:00

ext

looks like I changed stuff?

2021-06-25 20:29:27 -05:00

extensions

Always inject the HTML builder even in RTD builds

2021-02-02 03:01:12 -05:00

images

[matrix] Style "View Documentation For" dropdown

2020-12-18 21:18:58 -05:00

locale/ja/LC_MESSAGES

Change copyright year to present

2021-01-15 05:28:11 -05:00

api.rst

fix conflict

2021-06-25 20:33:22 -05:00

conf.py

fix conflicts

2021-05-02 21:05:05 -05:00

custom_features.rst

added Client.get_message

2021-02-11 18:38:33 -06:00

discord.rst

Update intents.rst & discord.rst

2021-01-03 03:28:33 -05:00

faq.rst

[docs] Fix various unresolved references

2021-05-01 10:26:11 -04:00

index.rst

conflict fixes

2021-01-14 18:03:09 -06:00

intents.rst

[docs] Grammar fixes for intents.rst

2021-03-24 08:13:42 -04:00

intro.rst

docs: fix simple typo, libaries -> libraries

2020-12-25 02:22:19 -05:00

logging.rst

logging.rst: Fix some typos and grammar errors

2020-10-16 22:46:31 -04:00

make.bat

Rename project from pydiscord to discord.py

2015-08-22 07:43:41 -04:00

Makefile

Rename project from pydiscord to discord.py

2015-08-22 07:43:41 -04:00

migrating_to_async.rst

Improve documentation

2019-06-07 19:27:46 -04:00

migrating.rst

Fix minor markdown typo in migrating.rst

2020-06-04 23:40:16 -04:00

quickstart.rst

Adjust quickstart to not show commands example

2021-05-01 10:31:00 -04:00

requests.inv

Improve documentation

2019-06-07 19:27:46 -04:00

version_guarantees.rst

Add some version guarantees to the documentation.

2019-04-08 02:18:48 -04:00

whats_new.rst

fix conflict

2021-06-25 20:33:22 -05:00