From: Harmon <Harmon758@gmail.com>
Date: Thu, 25 Apr 2019 07:12:55 +0000 (-0500)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=912d6516766c98e94dacf4cf79a61e078ab01312;p=tweepy.git

Merge branch 'master' into patch-1
---

912d6516766c98e94dacf4cf79a61e078ab01312
diff --cc tweepy/api.py
index cbd168c,baf0d54..c54d0b6
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@@ -816,9 -856,7 +856,9 @@@ class API(object)
  
      @property
      def blocks_ids(self):
-         """ :reference: https://dev.twitter.com/rest/reference/get/blocks/ids 
 -        """ :reference: https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-ids """
++        """ :reference: https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-ids
 +            :allowed_param:'cursor'
 +        """
          return bind_api(
              api=self,
              path='/blocks/ids.json',