aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicah <[email protected]>2022-11-25 16:39:10 -0500
committerGitHub <[email protected]>2022-11-25 16:39:10 -0500
commit99514e50d1e1ef6330397c2cada203dfa3891b3a (patch)
treecbac11da3a71a24bbb739d9aa8fda65bc7968dd4 /docs/index.rst
parent5d7ca19c30dc6579bf29610fe815b822889978e6 (diff)
parent10b2a9984237aaae6a512d441001e635060d6af7 (diff)
downloadmastodon.py-99514e50d1e1ef6330397c2cada203dfa3891b3a.tar.gz
Merge pull request #1 from halcy/master
pull in upstream
Diffstat (limited to 'docs/index.rst')
-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)