aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authormicah <[email protected]>2022-11-25 21:45:52 +0000
committermicah <[email protected]>2022-11-25 21:45:52 +0000
commitdd23f8b7c5e46989b2a73b21816c59bbbd34ef35 (patch)
treedd9c08cce97aec58daacd8f7b852d2e64886f951 /docs
parent2c7b58568db735534912b2bc0990294e9d4a9c19 (diff)
parent99514e50d1e1ef6330397c2cada203dfa3891b3a (diff)
downloadmastodon.py-dd23f8b7c5e46989b2a73b21816c59bbbd34ef35.tar.gz
Merge remote-tracking branch 'origin/master' into catgoat/domain_blocks
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 7a4bb48..a1d9695 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1089,6 +1089,9 @@ Reading data: Searching
1089Reading data: Trends 1089Reading data: Trends
1090-------------------- 1090--------------------
1091 1091
1092.. automethod:: Mastodon.trending_tags
1093.. automethod:: Mastodon.trending_statuses
1094.. automethod:: Mastodon.trending_links
1092.. automethod:: Mastodon.trends 1095.. automethod:: Mastodon.trends
1093 1096
1094Reading data: Mutes and blocks 1097Reading data: Mutes and blocks
@@ -1440,6 +1443,10 @@ have admin: scopes attached with a lot of care, but be extra careful with those
1440.. automethod:: Mastodon.admin_report_reopen 1443.. automethod:: Mastodon.admin_report_reopen
1441.. automethod:: Mastodon.admin_report_resolve 1444.. automethod:: Mastodon.admin_report_resolve
1442 1445
1446.. automethod:: Mastodon.admin_trending_tags
1447.. automethod:: Mastodon.admin_trending_statuses
1448.. automethod:: Mastodon.admin_trending_links
1449
1443Acknowledgements 1450Acknowledgements
1444---------------- 1451----------------
1445Mastodon.py contains work by a large number of contributors, many of which have 1452Mastodon.py contains work by a large number of contributors, many of which have
Powered by cgit v1.2.3 (git 2.41.0)